调整

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(){

src/main/java/com/qs/serve/controller/AdminPortalController.java

@@ -52,7 +52,6 @@ public class AdminPortalController {
         return R.ok(list);
     }
 
-
     /**
      * 登录接口
      * @return

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<String> uids = param.getUserIds().stream()
                 .filter(uid->supplier.getUserId()==null || !supplier.getUserId().equals(uid))
                 .collect(Collectors.toList());

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());

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("");
         }

src/main/java/com/qs/serve/modules/sys/service/impl/SysUserServiceImpl.java

@@ -80,7 +80,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         List<SysUser> list = baseMapper.listUser(sysUser);
         list.forEach(usr->{
             usr.setMobile(DesensitizedUtil.mobilePhone(usr.getMobile()));
-            usr.setAccount(DesensitizedUtil.mobilePhone(usr.getMobile()));
             usr.setPassword(null);
         });
         return list;

src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java

@@ -378,10 +378,12 @@ public class TbsActivityController {
                 }else {
                     for (Long goodsId : goodsIds) {
                         GoodsCategory category = goodsCategoryService.getById(goodsId);
+                        if(category!=null){
                             idPaths.add(category.getLevelPath());
                         }
                     }
                 }
+            }
 
             for (TbsBudget budget : budgetList) {
                 if(budget.getConditionFlag().equals(1)){

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字")

src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java

@@ -73,6 +73,7 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
                 Assert.throwEx("当前模板已停用");
             }
         }
+        tbsCostApply.setSubmitTime(LocalDateTime.now());
         if(tbsCostApply.getContractFlag().equals(1)){
             LambdaQueryWrapper<TbsActivityPayCondition> lqw = new LambdaQueryWrapper<>();
             lqw.eq(TbsActivityPayCondition::getCostApplyId,id);
@@ -89,11 +90,11 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
             }else if (activityList.size()<1){
                 Assert.throwEx("没有有效的活动内容");
             }else {
-//                Long supplierId = activityList.get(0).getSupplierId();
+                Long supplierId = activityList.get(0).getSupplierId();
-//                BmsSupplier supplier = bmsSupplierService.getById(supplierId);
+                BmsSupplier supplier = bmsSupplierService.getById(supplierId);
-//                if(!supplier.getSupplierFlag().equals(1)){
+                if(!supplier.getSupplierFlag().equals(1)){
-//                    Assert.throwEx("协议类申请只对供应商开放");
+                    Assert.throwEx("协议类申请只对供应商开放");
-//                }
+                }
                 BigDecimal total = activityList.get(0).getTotalAmount();
                 BigDecimal total2 = BigDecimal.ZERO;
                 for (TbsActivityPayCondition payCondition : payConditions) {
@@ -217,7 +218,7 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
             budgetLogService.saveBatch(budgetLogList);
         }
         //创建流程后回调
-        BaseCreateCallbackBo callbackBo = new BaseCreateCallbackBo(TbsSeeYonConst.CostApplyConf.Code(),formId);
+        BaseCreateCallbackBo callbackBo = new BaseCreateCallbackBo(TbsSeeYonConst.CostApplyConf.Code(),costApply.getId()+"");
         seeYonService.createCallbackStatus(callbackBo);
     }
 

src/main/java/com/qs/serve/modules/wx/controller/WxFormPushController.java

@@ -6,9 +6,12 @@ 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.CollectionUtil;
 import com.qs.serve.common.util.PageUtil;
 import com.qs.serve.common.util.CopierUtil;
 import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.modules.sys.entity.SysAttach;
+import com.qs.serve.modules.sys.service.SysAttachService;
 import com.qs.serve.modules.wx.entity.*;
 import com.qs.serve.modules.wx.entity.dto.sms.WxSmsNewForm;
 import com.qs.serve.modules.wx.entity.vo.WxPushResultVo;
@@ -23,10 +26,7 @@ import com.qs.serve.modules.wx.entity.bo.WxFormPushBo;
 
 import javax.validation.Valid;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
@@ -46,6 +46,7 @@ public class WxFormPushController {
     private WxUserService wxUserService;
     private WxPushService wxPushService;
     private WxAppService wxAppService;
+    private SysAttachService attachService;
 
 
     /**
@@ -85,12 +86,15 @@ public class WxFormPushController {
     @SysLog(module = SystemModule.Verification, title = "表单推送", biz = BizType.QUERY)
     public R<WxFormPush> getById(@PathVariable("id") String id){
         WxFormPush wxFormPush = wxFormPushService.getById(id);
-
         LambdaQueryWrapper<WxFormPushUser> userlqw = new LambdaQueryWrapper<>();
         userlqw.eq(WxFormPushUser::getFormPushId,wxFormPush.getId());
         List<WxFormPushUser> list = wxFormPushUserService.list(userlqw);
         wxFormPush.setWxFormPushUserList(list);
-
+        if(CollectionUtil.isNotEmpty(wxFormPush.getAttachIds())){
+            List<String> attachIds = Arrays.asList(wxFormPush.getAttachIds());
+            List<SysAttach> 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<Long> idsLong = StringUtils.splitIdLong(ids);
+        List<String> idsLong = StringUtils.splitIdString(ids);
         List<WxFormPush> list = wxFormPushService.listByIds(idsLong);
         for(WxFormPush formPush:list){
             if(formPush.getStatus().equals("1")){

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.*;
-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.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.*;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 /**
  * 微信 表单推送(我的)
@@ -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<String> attachIds = Arrays.asList(wxFormPush.getAttachIds());
+            List<SysAttach> attachList = attachService.listByIds(attachIds);
+            wxFormPush.setAttachList(attachList);
+        }
         LambdaQueryWrapper<WxFormPushUser> lqw = new LambdaQueryWrapper<>();
         lqw.eq(WxFormPushUser::getFormPushId,id);
         lqw.eq(WxFormPushUser::getUserId, AuthContextUtils.getSysUserId());

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<WxFormPushUser> wxFormPushUserList;
 
+    /** 附件 */
+    @TableField(exist = false)
+    private List<?> attachList;
+
 	public static WxFormPush toNewObject(WxFormPush source){
 		WxFormPush formPush = new WxFormPush();
 		formPush.setId(source.getId());

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;
+
 }
 

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`
         <where>
+            and `wx_form_push_user`.`del_flag` = '0'
+            and `wx_form_push`.`del_flag` = '0'
             <if test="query.id != null and query.id != ''"> and `wx_form_push`.`id` = #{query.id}</if>
             <if test="query.typeId != null and query.typeId != ''"> and `wx_form_push`.`type_id` = #{query.typeId}</if>
             <if test="query.typeCode != null and query.typeCode != ''"> and `wx_form_push`.`type_code` = #{query.typeCode}</if>