From c7fd940c013863610b9153d57bb4671aee0a2d8c Mon Sep 17 00:00:00 2001 From: Yen Date: Fri, 12 May 2023 10:41:04 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/config/DevEnvironmentConfig.java | 5 ++++- .../controller/AdminPortalController.java | 1 - .../bms/controller/BmsSupplierController.java | 5 +++++ .../seeyon/service/impl/SeeYonServiceImpl.java | 3 +++ .../sys/controller/SysUserController.java | 4 +--- .../sys/service/impl/SysUserServiceImpl.java | 1 - .../tbs/controller/TbsActivityController.java | 4 +++- .../serve/modules/tbs/entity/TbsCostApply.java | 5 +++++ .../service/impl/TbsCostApplyServiceImpl.java | 13 +++++++------ .../wx/controller/WxFormPushController.java | 18 +++++++++++------- .../controller/my/WxFormPushMyController.java | 18 ++++++++++-------- .../qs/serve/modules/wx/entity/WxFormPush.java | 12 +++++++++++- .../modules/wx/entity/bo/WxFormPushBo.java | 3 +++ .../resources/mapper/wx/WxFormPushMapper.xml | 2 ++ 14 files changed, 65 insertions(+), 29 deletions(-) diff --git a/src/main/java/com/qs/serve/common/config/DevEnvironmentConfig.java b/src/main/java/com/qs/serve/common/config/DevEnvironmentConfig.java index 6cb85448..4fce622a 100644 --- a/src/main/java/com/qs/serve/common/config/DevEnvironmentConfig.java +++ b/src/main/java/com/qs/serve/common/config/DevEnvironmentConfig.java @@ -2,17 +2,20 @@ package com.qs.serve.common.config; import com.qs.serve.common.util.Assert; import lombok.experimental.UtilityClass; +import lombok.extern.slf4j.Slf4j; /** * @author YenHex * @since 2022/3/11 */ +@Slf4j @UtilityClass public class DevEnvironmentConfig { private static Boolean devEnv = null; public static void openDevEnv(Boolean open){ - if(devEnv==null){devEnv = open;} + log.warn("环境变量：devEnv=>>> "+open); + devEnv = open; } public static Boolean isDev(){ diff --git a/src/main/java/com/qs/serve/controller/AdminPortalController.java b/src/main/java/com/qs/serve/controller/AdminPortalController.java index fba009d5..14752f94 100644 --- a/src/main/java/com/qs/serve/controller/AdminPortalController.java +++ b/src/main/java/com/qs/serve/controller/AdminPortalController.java @@ -52,7 +52,6 @@ public class AdminPortalController { return R.ok(list); } - /** * 登录接口 * @return diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java index 3d690860..6d9ba60a 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java @@ -193,6 +193,11 @@ public class BmsSupplierController { @PreAuthorize("hasRole('bms:supplier:update')") public R relateSuppliers2(@RequestBody SysRelateSuppliersParam2 param){ BmsSupplier supplier = bmsSupplierService.getById(param.getSupplierId()); + if(CollectionUtil.isNotEmpty(supplier.getOtherUserIds())){ + for (String userId : supplier.getOtherUserIds()) { + param.getUserIds().add(userId); + } + } List uids = param.getUserIds().stream() .filter(uid->supplier.getUserId()==null || !supplier.getUserId().equals(uid)) .collect(Collectors.toList()); diff --git a/src/main/java/com/qs/serve/modules/seeyon/service/impl/SeeYonServiceImpl.java b/src/main/java/com/qs/serve/modules/seeyon/service/impl/SeeYonServiceImpl.java index ebec0871..70ecfcd1 100644 --- a/src/main/java/com/qs/serve/modules/seeyon/service/impl/SeeYonServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/seeyon/service/impl/SeeYonServiceImpl.java @@ -56,6 +56,9 @@ public class SeeYonServiceImpl implements SeeYonService { SysUser sysUser = sysUserService.getById(AuthContextUtils.getSysUserId()); sysUser.checkSyAccount(); CtpAffairCommit param = new CtpAffairCommit(); + if(formCode==null){ + Assert.throwEx("系统异常，请联系管理员"); + } param.setFormCode(formCode); param.setFromRecordId(formRecordId); param.setState(affairCommit.getState()); diff --git a/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java b/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java index a2b86bb5..21906de2 100644 --- a/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java +++ b/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java @@ -226,6 +226,7 @@ public class SysUserController { public R save(@RequestBody @Valid SysUserBo userBo){ SysUser param = CopierUtil.copy(userBo,new SysUser()); param.setAccount(userBo.getCode()); + param.setSyAccount(userBo.getCode()); //设置普通管理员 param.setSuperFlag(0); param.setTenantId(AuthContextUtils.getTenant()); @@ -244,9 +245,6 @@ public class SysUserController { return R.error("手机号已被注册"); } param.setPassword(SecureUtil.md5(GySysConst.DEFAULT_PASSWORD)); - if(param.getMobile()!=null){ - param.setAccount(param.getMobile()); - } if(param.getSyUserId()==null){ param.setSyUserId(""); } diff --git a/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserServiceImpl.java b/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserServiceImpl.java index edd5f528..f485ea72 100644 --- a/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserServiceImpl.java @@ -80,7 +80,6 @@ public class SysUserServiceImpl extends ServiceImpl impl List list = baseMapper.listUser(sysUser); list.forEach(usr->{ usr.setMobile(DesensitizedUtil.mobilePhone(usr.getMobile())); - usr.setAccount(DesensitizedUtil.mobilePhone(usr.getMobile())); usr.setPassword(null); }); return list; diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java index d3de5efe..5f0b60bd 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java @@ -378,7 +378,9 @@ public class TbsActivityController { }else { for (Long goodsId : goodsIds) { GoodsCategory category = goodsCategoryService.getById(goodsId); - idPaths.add(category.getLevelPath()); + if(category!=null){ + idPaths.add(category.getLevelPath()); + } } } } diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostApply.java b/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostApply.java index c26e0dd3..b5f1951a 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostApply.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostApply.java @@ -62,6 +62,11 @@ public class TbsCostApply implements Serializable { @Length(max = 255,message = "备注长度不能超过255字") private String remark; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @TableField(fill = FieldFill.INSERT) + private LocalDateTime submitTime; + /** 申请人 */ @NotBlank(message = "申请人不能为空") @Length(max = 32,message = "申请人长度不能超过32字") diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java index 28a0c678..43fe20be 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java @@ -73,6 +73,7 @@ public class TbsCostApplyServiceImpl extends ServiceImpl lqw = new LambdaQueryWrapper<>(); lqw.eq(TbsActivityPayCondition::getCostApplyId,id); @@ -89,11 +90,11 @@ public class TbsCostApplyServiceImpl extends ServiceImpl getById(@PathVariable("id") String id){ WxFormPush wxFormPush = wxFormPushService.getById(id); - LambdaQueryWrapper userlqw = new LambdaQueryWrapper<>(); userlqw.eq(WxFormPushUser::getFormPushId,wxFormPush.getId()); List list = wxFormPushUserService.list(userlqw); wxFormPush.setWxFormPushUserList(list); - + if(CollectionUtil.isNotEmpty(wxFormPush.getAttachIds())){ + List attachIds = Arrays.asList(wxFormPush.getAttachIds()); + List attachList = attachService.listByIds(attachIds); + wxFormPush.setAttachList(attachList); + } return R.ok(wxFormPush); } @@ -271,7 +275,7 @@ public class WxFormPushController { @DeleteMapping("/deleteById/{ids}") @SysLog(module = SystemModule.Verification, title = "表单推送", biz = BizType.DELETE) public R deleteById(@PathVariable("ids") String ids){ - List idsLong = StringUtils.splitIdLong(ids); + List idsLong = StringUtils.splitIdString(ids); List list = wxFormPushService.listByIds(idsLong); for(WxFormPush formPush:list){ if(formPush.getStatus().equals("1")){ diff --git a/src/main/java/com/qs/serve/modules/wx/controller/my/WxFormPushMyController.java b/src/main/java/com/qs/serve/modules/wx/controller/my/WxFormPushMyController.java index 35fbac3d..b4783ac2 100644 --- a/src/main/java/com/qs/serve/modules/wx/controller/my/WxFormPushMyController.java +++ b/src/main/java/com/qs/serve/modules/wx/controller/my/WxFormPushMyController.java @@ -6,11 +6,10 @@ import com.qs.serve.common.model.dto.PageVo; import com.qs.serve.common.model.dto.R; import com.qs.serve.common.model.enums.BizType; import com.qs.serve.common.model.enums.SystemModule; -import com.qs.serve.common.util.AuthContextUtils; -import com.qs.serve.common.util.CopierUtil; -import com.qs.serve.common.util.PageUtil; -import com.qs.serve.common.util.StringUtils; +import com.qs.serve.common.util.*; import com.qs.serve.modules.baz.entity.BazVisitInstance; +import com.qs.serve.modules.sys.entity.SysAttach; +import com.qs.serve.modules.sys.service.SysAttachService; import com.qs.serve.modules.wx.entity.WxFormPush; import com.qs.serve.modules.wx.entity.WxFormPushUser; import com.qs.serve.modules.wx.entity.bo.WxFormPushBo; @@ -23,10 +22,7 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * 微信 表单推送(我的) @@ -41,6 +37,7 @@ public class WxFormPushMyController { private WxFormPushService wxFormPushService; private WxFormPushMapper wxFormPushMapper; + private SysAttachService attachService; private WxFormPushUserService wxFormPushUserService; /** @@ -97,6 +94,11 @@ public class WxFormPushMyController { wxFormPush.setFormContextValue(null); return R.ok(wxFormPush); } + if(CollectionUtil.isNotEmpty(wxFormPush.getAttachIds())){ + List attachIds = Arrays.asList(wxFormPush.getAttachIds()); + List attachList = attachService.listByIds(attachIds); + wxFormPush.setAttachList(attachList); + } LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); lqw.eq(WxFormPushUser::getFormPushId,id); lqw.eq(WxFormPushUser::getUserId, AuthContextUtils.getSysUserId()); diff --git a/src/main/java/com/qs/serve/modules/wx/entity/WxFormPush.java b/src/main/java/com/qs/serve/modules/wx/entity/WxFormPush.java index 4591dc12..4326cb42 100644 --- a/src/main/java/com/qs/serve/modules/wx/entity/WxFormPush.java +++ b/src/main/java/com/qs/serve/modules/wx/entity/WxFormPush.java @@ -10,7 +10,9 @@ import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; +import com.qs.serve.common.framework.mybatis.handler.meta.SplitStringTypeHandler; import lombok.Data; +import org.apache.ibatis.type.JdbcType; import org.hibernate.validator.constraints.Length; import org.springframework.format.annotation.DateTimeFormat; @@ -23,7 +25,7 @@ import javax.validation.constraints.NotBlank; * @since 2023-04-24 */ @Data -@TableName("wx_form_push") +@TableName(value = "wx_form_push",autoResultMap = true) public class WxFormPush implements Serializable { private static final long serialVersionUID = 1L; @@ -66,6 +68,10 @@ public class WxFormPush implements Serializable { @Length(max = 600,message = "备注长度不能超过600字") private String remark; + /** 附件ids */ + @TableField(typeHandler = SplitStringTypeHandler.class,jdbcType= JdbcType.VARCHAR) + private String[] attachIds; + /** 创建时间 */ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @@ -120,6 +126,10 @@ public class WxFormPush implements Serializable { @TableField(exist = false) private List wxFormPushUserList; + /** 附件 */ + @TableField(exist = false) + private List attachList; + public static WxFormPush toNewObject(WxFormPush source){ WxFormPush formPush = new WxFormPush(); formPush.setId(source.getId()); diff --git a/src/main/java/com/qs/serve/modules/wx/entity/bo/WxFormPushBo.java b/src/main/java/com/qs/serve/modules/wx/entity/bo/WxFormPushBo.java index 41ad43ac..2a18e0d0 100644 --- a/src/main/java/com/qs/serve/modules/wx/entity/bo/WxFormPushBo.java +++ b/src/main/java/com/qs/serve/modules/wx/entity/bo/WxFormPushBo.java @@ -50,5 +50,8 @@ public class WxFormPushBo implements Serializable { @NotNull(message = "状态不能为空") private String status; + /** 附件ids */ + private String[] attachIds; + } diff --git a/src/main/resources/mapper/wx/WxFormPushMapper.xml b/src/main/resources/mapper/wx/WxFormPushMapper.xml index 9658b0f4..ea502d3a 100644 --- a/src/main/resources/mapper/wx/WxFormPushMapper.xml +++ b/src/main/resources/mapper/wx/WxFormPushMapper.xml @@ -50,6 +50,8 @@ left join wx_form_push_user `wx_form_push_user` on `wx_form_push_user`.`form_push_id` = `wx_form_push`.`id` + and `wx_form_push_user`.`del_flag` = '0' + and `wx_form_push`.`del_flag` = '0' and `wx_form_push`.`id` = #{query.id} and `wx_form_push`.`type_id` = #{query.typeId} and `wx_form_push`.`type_code` = #{query.typeCode}