Merge remote-tracking branch 'origin/v1.0' into v1.0

src/main/java/com/qs/serve/modules/baz/entity/BazVisitInstance.java

@@ -145,12 +145,12 @@ public class BazVisitInstance implements Serializable {
 
     /** 签到时间 */
     @TableField(exist = false)
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private LocalDateTime signTime;
 
     /** 签退时间 */
     @TableField(exist = false)
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private LocalDateTime outTime;
 
     /** 查询开始时间 */

src/main/java/com/qs/serve/modules/baz/service/impl/BazVisitFlowServiceImpl.java

@@ -2,6 +2,7 @@ package com.qs.serve.modules.baz.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qs.serve.common.util.Assert;
 import com.qs.serve.modules.baz.entity.BazVisit;
 import com.qs.serve.modules.baz.entity.bo.BazVisitFlowBo;
 import com.qs.serve.modules.baz.mapper.BazVisitMapper;
@@ -34,6 +35,15 @@ public class BazVisitFlowServiceImpl extends ServiceImpl<BazVisitFlowMapper,BazV
         entity.setVisitId(bazVisit.getId());
         entity.setTargetType(bazVisit.getTargetType());
         entity.setVisitName(bazVisit.getVisitName());
+        entity.setFlowBizType(param.getFlowBizType());
+        if(param.getFlowBizType()!=null&& param.getFlowBizType() >0){
+            LambdaQueryWrapper<BazVisitFlow> lqwErrCount = new LambdaQueryWrapper<>();
+            lqwErrCount.eq(BazVisitFlow::getVisitId,bazVisit.getId());
+            lqwErrCount.eq(BazVisitFlow::getFlowBizType,param.getFlowBizType());
+            if(this.count(lqwErrCount)>0){
+                Assert.throwEx("流程中业务类型不能重复");
+            }
+        }
         //设置排序
         LambdaQueryWrapper<BazVisitFlow> lqwCount = new LambdaQueryWrapper<>();
         lqwCount.eq(BazVisitFlow::getVisitId,param.getVisitId());

src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java

@@ -28,6 +28,7 @@ import com.qs.serve.modules.sys.entity.bo.SysRelateSuppliersParam;
 import com.qs.serve.modules.sys.entity.bo.SysRelateSuppliersParam2;
 import com.qs.serve.modules.sys.entity.dto.SysUserSimpleVo;
 import com.qs.serve.modules.sys.entity.dto.SysUserVo;
+import com.qs.serve.modules.sys.service.SysAttachService;
 import com.qs.serve.modules.sys.service.SysPostUserService;
 import com.qs.serve.modules.sys.service.SysUserService;
 import com.qs.serve.modules.tbs.common.TbsCenterType;
@@ -68,6 +69,7 @@ public class BmsSupplierController {
     private RedisService redisService;
     private TbsBudgetService tbsBudgetService;
     private BmsSupplierMyController supplierMyController;
+    private SysAttachService attachService;
 
     /**
      * 翻页查询
@@ -550,6 +552,9 @@ public class BmsSupplierController {
             bmsSupplier.setRegion2ThirdInfo(obj33);
             bmsSupplier.setRegion2FourthlyInfo(obj44);
         }
+        if(bmsSupplier.getSupplierAttachIds()!=null&&bmsSupplier.getSupplierAttachIds().length>0){
+            bmsSupplier.setSupplierAttachInfoList(attachService.listByIds(Arrays.asList(bmsSupplier.getSupplierAttachIds())));
+        }
         bmsSupplier.setUserVos(userVos);
         return R.ok(bmsSupplier);
     }

src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java

@@ -121,6 +121,26 @@ public class BmsSupplier implements Serializable {
     /** 是否供应商 */
     private Integer supplierFlag;
 
+    /** 供应商是否填写信息 */
+    @NotNull(message = "供应商是否填写信息不能为空")
+    private Integer supplierInfoFlag;
+
+    /** 供应商税号 */
+    @Length(max = 255,message = "供应商税号长度不能超过255字")
+    private String supplierTaxNumber;
+
+    /** 供应商联系人 */
+    @Length(max = 255,message = "供应商联系人长度不能超过255字")
+    private String supplierUser;
+
+    /** 营业执照地址 */
+    @Length(max = 255,message = "营业执照地址长度不能超过255字")
+    private String supplierLicenseImg;
+
+    /** 附件列表 */
+    @TableField(typeHandler = SplitStringTypeHandler.class,jdbcType= JdbcType.VARCHAR)
+    private String[] supplierAttachIds;
+
     private Integer cooperatePauseFlag;
 
     /** 暂不合作日期 */
@@ -260,6 +280,10 @@ public class BmsSupplier implements Serializable {
     @TableField(exist = false)
     private Integer pageSize;
 
+    /** 供应商附件 */
+    @TableField(exist = false)
+    private List<?> supplierAttachInfoList;
+
     @TableField(exist = false)
     private List<String> selectSaleRegionIds;
 

src/main/java/com/qs/serve/modules/bms/entity/bo/BmsSupplierBo.java

@@ -1,9 +1,12 @@
 package com.qs.serve.modules.bms.entity.bo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
+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;
 
@@ -57,6 +60,25 @@ public class BmsSupplierBo {
     /** 是否供应商 */
     private Integer supplierFlag;
 
+    /** 供应商是否填写信息 */
+    @NotNull(message = "供应商是否填写信息不能为空")
+    private Integer supplierInfoFlag;
+
+    /** 供应商税号 */
+    @Length(max = 255,message = "供应商税号长度不能超过255字")
+    private String supplierTaxNumber;
+
+    /** 供应商联系人 */
+    @Length(max = 255,message = "供应商联系人长度不能超过255字")
+    private String supplierUser;
+
+    /** 营业执照地址 */
+    @Length(max = 255,message = "营业执照地址长度不能超过255字")
+    private String supplierLicenseImg;
+
+    /** 附件列表 */
+    private String[] supplierAttachIds;
+
     private String belong;
 
     /** 闭户 */

src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierServiceImpl.java

@@ -99,6 +99,12 @@ public class BmsSupplierServiceImpl extends ServiceImpl<BmsSupplierMapper,BmsSup
 //                supplierApplicationService.migrateRegion(editId,TbsCenterType.bizRegion.name(), orgBizRegionId, bizRegion);
 //            }
         }
+        if(param.getSupplierInfoFlag()==null||!param.getSupplierInfoFlag().equals(1)){
+            param.setSupplierTaxNumber("");
+            param.setSupplierUser("");
+            param.setSupplierLicenseImg("");
+            param.setSupplierAttachIds(new String[]{});
+        }
         this.saveOrUpdate(supplier);
     }
 

src/main/java/com/qs/serve/modules/oms/entity/OmsOrder.java

@@ -99,7 +99,7 @@ public class OmsOrder implements Serializable {
     /** 是否加急 */
     private Integer urgentFlag;
 
-    /** 订单状态 0->待 */
+    /** 订单状态 0->草稿；1->下单；2->已确认 */
     private Integer status;
 
     /** 备注 */

src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java

@@ -164,10 +164,13 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper,OmsOrder> im
         //todo 计算是否有活动优惠
         //收货地址
         BmsSupplierAddress supplierAddress;
-        if(confirmOrder.getAddressId()!=null){
+        if(confirmOrder.getAddressId()==null){
-            supplierAddress = bmsSupplierAddressService.getById(confirmOrder.getAddressId());
-        }else {
             supplierAddress = bmsSupplierAddressService.getDefault(Long.parseLong(supplier.getId()));
+        }else if (confirmOrder.getAddressId().equals(0L)){
+            supplierAddress = new BmsSupplierAddress();
+            supplierAddress.setId(0L);
+        }else {
+            supplierAddress = bmsSupplierAddressService.getById(confirmOrder.getAddressId());
         }
         OmsConfirmOrderResult confirmOrderResult = new OmsConfirmOrderResult();
         confirmOrderResult.setSupplier(supplier);

src/main/java/com/qs/serve/modules/tag/controller/TagDataController.java

@@ -1,5 +1,6 @@
 package com.qs.serve.modules.tag.controller;
 
+import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.qs.serve.common.model.annotation.SysLog;
 import com.qs.serve.common.model.dto.PageVo;
@@ -92,7 +93,10 @@ public class TagDataController {
     @SysLog(module = SystemModule.Tag, title = "标签信息", biz = BizType.INSERT)
     public R<?> save(@RequestBody @Valid TagInfoBindBo param){
         Integer saveType = param.getSaveType();
-        List<TagInfo> tagInfoList = tagInfoService.listByIds(param.getTagIds());
+        List<TagInfo> tagInfoList = new ArrayList<>();
+        if(CollUtil.isNotEmpty(param.getTagIds())){
+            tagInfoList = tagInfoService.listByIds(param.getTagIds());
+        }
         for (TargetObjectDTO objectDTO : param.getTargetList()) {
             if(objectDTO.getTargetType().equals(TagTypeConst.Customer)){
                 BmsSupplier bmsSupplier = bmsSupplierService.getById(objectDTO.getTargetId());

src/main/java/com/qs/serve/modules/tag/entity/so/TagInfoSo.java

@@ -5,6 +5,8 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
+import com.baomidou.mybatisplus.annotation.SqlCondition;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -29,6 +31,9 @@ public class TagInfoSo implements Serializable {
     /** id */
     private Long id;
 
+    /** 标签名 */
+    private String tagCode;
+
     /** 标签名 */
     private String tagName;
 

src/main/java/com/qs/serve/modules/tag/service/impl/TagCategoryServiceImpl.java

@@ -27,49 +27,76 @@ public class TagCategoryServiceImpl extends ServiceImpl<TagCategoryMapper,TagCat
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void modify(TagCategory category) {
+    public void modify(TagCategory current) {
-        TagCategory dbData = this.getById(category.getId());
+        TagCategory orgData = this.getById(current.getId());
         TagCategory parent = null;
-        if(category.getPid()!=null&&!category.getPid().equals("0")){
+        if(current.getPid()!=null&&!current.getPid().equals("0")){
-            parent = this.getById(category.getPid());
+            parent = this.getById(current.getPid());
             if(parent==null){
                 Assert.throwEx("父级标签不存在");
             }
         }
-        if(category.getId()==null){
+        if(current.getId()==null){
-            this.save(category);
+            this.save(current);
         }
-        if(parent==null){
+
-            category.setPid("0");
+        String newParentPathIds = null;
-            category.setPathIds(category.getId());
+        if(parent==null) {
+            //无上级
+            current.setPid("0");
+            current.setPathIds(current.getId());
+        }else if (parent.getPathIds().contains(current.getId())){
+            //上下级互换
+            Assert.throwEx("不支持上下级互换");
+            current.setPathIds(parent.getPathIds().replace(parent.getId(),"") + current.getId());
+            newParentPathIds = current.getPathIds()+"_"+parent.getId();
         }else {
-            category.setPathIds(parent.getPathIds()+"_"+category.getId());
+            //一般设置上级
+            current.setPathIds(parent.getPathIds()+"_"+current.getId());
         }
-        if(dbData==null){
+        if(orgData==null){
-            this.saveOrUpdate(category);
+            this.saveOrUpdate(current);
         }else {
-            this.updateById(category);
+            this.updateById(current);
-            boolean changePid = !dbData.getPid().equals(category.getPid());
+            boolean changePid = !orgData.getPid().equals(current.getPid());
             if(changePid){
                 LambdaQueryWrapper<TagCategory> lqw = new LambdaQueryWrapper<>();
                 lqw.and(v1->{
-                    v1.eq(TagCategory::getPathIds,dbData.getPathIds())
+                    v1.eq(TagCategory::getPathIds,orgData.getPathIds())
-                            .or().likeRight(TagCategory::getPathIds,dbData.getPathIds()+"_");
+                            .or().likeRight(TagCategory::getPathIds,orgData.getPathIds()+"_");
                 });
                 List<TagCategory> childList = this.list(lqw);
                 List<TagCategory> categoryList = childList.stream().map(obj->{
                     TagCategory par = new TagCategory();
                     par.setId(obj.getId());
-                    par.setPathIds(obj.getPathIds().replace(dbData.getPathIds(),category.getPathIds()));
+                    par.setPathIds(obj.getPathIds().replace(orgData.getPathIds(),current.getPathIds()));
                     return par;
                 }).collect(Collectors.toList());
                 this.updateBatchById(categoryList);
+                //补充上下级互换
+                if(newParentPathIds!=null){
+                    LambdaQueryWrapper<TagCategory> lqwParent = new LambdaQueryWrapper<>();
+                    TagCategory finalParent = parent;
+                    lqwParent.and(v1->{
+                        v1.eq(TagCategory::getPathIds, finalParent.getPathIds())
+                                .or().likeRight(TagCategory::getPathIds,finalParent.getPathIds()+"_");
+                    });
+                    List<TagCategory> parentChildList = this.list(lqwParent);
+                    String finalNewParentPathIds = newParentPathIds;
+                    List<TagCategory> parentCategoryList = parentChildList.stream().map(obj->{
+                        TagCategory par = new TagCategory();
+                        par.setId(obj.getId());
+                        par.setPathIds(obj.getPathIds().replace(finalParent.getPathIds(), finalNewParentPathIds));
+                        return par;
+                    }).collect(Collectors.toList());
+                    this.updateBatchById(parentCategoryList);
+                }
             }else {
                 //不进行更新
-                category.setPathIds(null);
+                current.setPathIds(null);
-                category.setPid(null);
+                current.setPid(null);
             }
-            this.updateById(category);
+            this.updateById(current);
 
         }
 

src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java

@@ -212,7 +212,9 @@ public class TbsBudgetApplicationService {
             }
         }
         // budgetIds交集
+        if(limitBudgetIds.size()>0){
             budgetIds = (List<Long>) CollectionUtils.intersection(budgetIds, limitBudgetIds);
+        }
         // 加载所有条件
         List<TbsBudget> budgetList;
         if(budgetIds.size()>0){

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

@@ -234,6 +234,7 @@ public class TbsBudgetChangeServiceImpl extends ServiceImpl<TbsBudgetChangeMappe
         budgetChange.setUserId(sysUser.getId());
         budgetChange.setUserCode(sysUser.getCode());
         budgetChange.setUserName(sysUser.getName());
+        budgetChange.setRemark(param.getRemark());
         budgetChange.setBudgetCheckState(TbsBudgetCheckState.State_1_apply);
         boolean notChangeTitle = param.getBudgetCode()!=null&& param.getBudgetCode().equals(budget.getBudgetCode());
         if(!notChangeTitle){

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

@@ -513,7 +513,34 @@ public class TbsBudgetServiceImpl extends ServiceImpl<TbsBudgetMapper,TbsBudget>
                 budgetLogLambdaQueryWrapper.eq(TbsBudgetLog::getScheduleItemBudgetId, a.getId());
                 List<TbsBudgetLog> logList = budgetLogService.list(budgetLogLambdaQueryWrapper);
                 a.setBudgetAmount(logList.stream().map(b -> b.getAmount()).reduce(BigDecimal.ZERO, BigDecimal::add));
+
             });
+//            scheduleItemBudgets.forEach(a -> {
+//                LambdaQueryWrapper<TbsBudgetLog> budgetLogLambdaQueryWrapper = new LambdaQueryWrapper<>();
+//                budgetLogLambdaQueryWrapper.eq(TbsBudgetLog::getScheduleItemBudgetId, a.getId());
+//                List<TbsBudgetLog> logList = budgetLogService.list(budgetLogLambdaQueryWrapper);
+//
+//                BigDecimal finalOrgBudget = BigDecimal.ZERO;
+//                BigDecimal usedOrgBudget = BigDecimal.ZERO;
+//                BigDecimal surplusOrgBudget = BigDecimal.ZERO;
+//                for (TbsBudgetLog budgetLog : logList) {
+//                    boolean finalMatch = BudgetLogOptFlag.getFinalBudgetOptFlag()
+//                            .stream().anyMatch(opt->budgetLog.getOptType().equals(opt));
+//                    if(finalMatch){
+//                        finalOrgBudget = finalOrgBudget.add(budgetLog.getAmount());
+//                    }else {
+//                        usedOrgBudget = usedOrgBudget.add(budgetLog.getAmount());
+//                    }
+//                    surplusOrgBudget = surplusOrgBudget.add(budgetLog.getAmount());
+//                }
+//
+//                //原预算金额
+//                //a.setBudgetAmount();
+//                //调整后预算金额
+//                a.setFinalBudgetAmount(finalOrgBudget);
+//                a.setUsedBudgetAmount(usedOrgBudget);
+//                a.setUnUsedBudgetAmount(surplusOrgBudget);
+//            });
         }
         budgetVo.setScheduleItem(scheduleItemBudgets);
 

src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationDataController.java

@@ -51,7 +51,7 @@ public class VtbVerificationDataController {
                 activityIds.add(0L);
             }
             query.setActivityIds(activityIds);
-            query.setOpenPage(0);
+            query.setOpenPage(1);
 
             List<VtbActivityCheckDTO> list = verReportMapper.pageActiveAndVtbDataAmount(query);
             PageVo<VtbActivityCheckDTO> page = new PageVo<>();

src/main/resources/mapper/baz/BazVisitInstanceMapper.xml

@@ -64,18 +64,18 @@
     <select id="selectBazVisitInstanceList" parameterType="com.qs.serve.modules.baz.entity.BazVisitInstance" resultMap="bazVisitInstanceMap">
         SELECT
         ins_flow.remark as summary,
-        ins_flow2.create_time as sign_time,
+        ins_flow2.submit_time as sign_time,
-        ins_flow3.create_time as out_time,
+        ins_flow3.submit_time as out_time,
         <include refid="bazVisitInstanceSql"/>
         FROM `baz_visit_instance` `baz_visit_instance`
         left join (
             select baz_visit_instance_flow.remark,baz_visit_instance_flow.visit_instance_id from baz_visit_instance_flow where flow_biz_type = '3'
         ) ins_flow on ins_flow.visit_instance_id = baz_visit_instance.id
         left join (
-            select baz_visit_instance_flow.create_time,baz_visit_instance_flow.visit_instance_id from baz_visit_instance_flow where flow_biz_type = '1'
+            select baz_visit_instance_flow.submit_time,baz_visit_instance_flow.visit_instance_id from baz_visit_instance_flow where flow_biz_type = '1'
         ) ins_flow2 on ins_flow2.visit_instance_id = baz_visit_instance.id
         left join (
-            select baz_visit_instance_flow.create_time,baz_visit_instance_flow.visit_instance_id from baz_visit_instance_flow where flow_biz_type = '2'
+            select baz_visit_instance_flow.submit_time,baz_visit_instance_flow.visit_instance_id from baz_visit_instance_flow where flow_biz_type = '2'
         ) ins_flow3 on ins_flow3.visit_instance_id = baz_visit_instance.id
         <where>
             <if test="query.id != null"> and `baz_visit_instance`.`id` = #{query.id}</if>
@@ -84,11 +84,11 @@
             <if test="query.targetType != null and query.targetType != ''"> and `baz_visit_instance`.`target_type` = #{query.targetType}</if>
             <if test="query.visitState != null"> and `baz_visit_instance`.`visit_state` = #{query.visitState}</if>
             <if test="query.visitorId != null and query.visitorId != ''"> and `baz_visit_instance`.`visitor_id` = #{query.visitorId}</if>
-            <if test="query.visitorCode != null and query.visitorCode != ''"> and `baz_visit_instance`.`visitor_code` = #{query.visitorCode}</if>
+            <if test="query.visitorCode != null and query.visitorCode != ''"> and `baz_visit_instance`.`visitor_code` like concat('%',#{query.visitorCode},'%')</if>
-            <if test="query.visitorName != null and query.visitorName != ''"> and `baz_visit_instance`.`visitor_name` = #{query.visitorName}</if>
+            <if test="query.visitorName != null and query.visitorName != ''"> and `baz_visit_instance`.`visitor_name` like concat('%',#{query.visitorName},'%')</if>
             <if test="query.targetId != null and query.targetId != ''"> and `baz_visit_instance`.`target_id` = #{query.targetId}</if>
-            <if test="query.targetCode != null and query.targetCode != ''"> and `baz_visit_instance`.`target_code` = #{query.targetCode}</if>
+            <if test="query.targetCode != null and query.targetCode != ''"> and `baz_visit_instance`.`target_code` like concat('%',#{query.targetCode},'%') </if>
-            <if test="query.targetName != null and query.targetName != ''"> and `baz_visit_instance`.`target_name` = #{query.targetName}</if>
+            <if test="query.targetName != null and query.targetName != ''"> and `baz_visit_instance`.`target_name`  like concat('%',#{query.targetName},'%')</if>
             <if test="query.targetLocalX != null and query.targetLocalX != ''"> and `baz_visit_instance`.`target_local_x` = #{query.targetLocalX}</if>
             <if test="query.targetLocalY != null and query.targetLocalY != ''"> and `baz_visit_instance`.`target_local_y` = #{query.targetLocalY}</if>
             <if test="query.targetAddress != null and query.targetAddress != ''"> and `baz_visit_instance`.`target_address` = #{query.targetAddress}</if>

src/main/resources/mapper/tag/TagDataMapper.xml

@@ -45,6 +45,7 @@
         FROM `tag_data` `tag_data`
         left join tag_info on tag_data.tag_id = tag_info.id
         <where>
+            and tag_info.del_flag = 0 and `tag_data`.del_flag = 0
             <if test="query.id != null"> and `tag_data`.`id` = #{query.id}</if>
             <if test="query.tagName != null and query.tagName != ''"> and `tag_data`.`tag_name` = #{query.tagName}</if>
             <if test="query.tagId != null"> and `tag_data`.`tag_id` = #{query.tagId}</if>