楚江ERP：审核状态回显修改，增加元素字段

@@ -103,6 +103,7 @@ create table if not exists `tbl_contract_distributor_standard`
     `surface`                    TEXT COMMENT '表面',
     `tolerance`                  TEXT COMMENT '公差',
     `performance`                TEXT COMMENT '性能',
+    `component`                  TEXT COMMENT '元素',
     `packaging`                  TEXT COMMENT '包装',
     `special_terms`              VARCHAR(50) COMMENT '特别条款要求',
     `designated_consignee`       TEXT COMMENT '需方指定收货人',
@@ -115,16 +116,20 @@ create table if not exists `tbl_contract_distributor_standard`
     `formal_file_name`           VARCHAR(255) COMMENT '正式合同文件名称',
     `formal_standardized`        TINYINT(1) COMMENT '正式合同是否规范 (0-不规范, 1-规范)',
     `formal_approved`            varchar(20) COMMENT '正式合同是否审核完成(AUDIT:审核中,PASS:审核通过,REFUSE:已驳回,CANCEL:已取消)',
+    `formal_approver_id`         varchar(32) COMMENT '正式合同审批人ID',
+    `formal_time`                datetime COMMENT '正式合同审批完成时间',
     `standard_file_id`           VARCHAR(100) COMMENT '标准合同文件ID',
     `standard_file_name`         VARCHAR(255) COMMENT '标准合同文件名称',
     `standard_standardized`      TINYINT(1) COMMENT '标准合同是否规范 (0-不规范, 1-规范)',
-    `standard_approved`          varchar(20)  COMMENT '标准合同是否审核完成(AUDIT:审核中,PASS:审核通过,REFUSE:已驳回,CANCEL:已取消)',
+    `standard_approved`          varchar(20) COMMENT '标准合同是否审核完成(AUDIT:审核中,PASS:审核通过,REFUSE:已驳回,CANCEL:已取消)',
+    `standard_approver_id`       varchar(32) COMMENT '标准合同审批人ID',
+    `standard_time`               datetime COMMENT '标准合同审批完成时间',
     `create_by_id`               varchar(32)  not null comment '创建人ID',
     `create_by`                  varchar(20)  not null comment '创建人',
     `update_by_id`               varchar(32)  not null comment '更新人ID',
     `update_by`                  varchar(20)  not null comment '更新人',
-    `create_time`                datetime default now() comment '创建时间',
-    `update_time`                datetime default now() comment '更新时间'
+    `create_time`                datetime              default now() comment '创建时间',
+    `update_time`                datetime              default now() comment '更新时间'
 );
 
 -- 经销合同物料行

@@ -11,6 +11,7 @@ import org.hibernate.validator.constraints.Length;
 import javax.validation.constraints.NotBlank;
 import java.math.BigDecimal;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -215,6 +216,12 @@ public class GetContractDistributorStandardBo extends BaseBo<ContractDistributor
     private String performance;
 
     /**
+     * 元素
+     */
+    @ApiModelProperty(value = "元素")
+    private String component;
+
+    /**
      * 包装
      */
     @ApiModelProperty("包装")
@@ -317,6 +324,18 @@ public class GetContractDistributorStandardBo extends BaseBo<ContractDistributor
     private String formalApproved;
 
     /**
+     * 正式合同审批人ID
+     */
+    @ApiModelProperty(value = "正式合同审批人ID")
+    private String formalApproverId;
+
+    /**
+     * 正式合同审批完成时间
+     */
+    @ApiModelProperty(value = "正式合同审批完成时间")
+    private LocalDateTime formalTime;
+
+    /**
      * 标准合同文件ID
      */
     @ApiModelProperty("标准合同文件ID")
@@ -340,6 +359,18 @@ public class GetContractDistributorStandardBo extends BaseBo<ContractDistributor
     @ApiModelProperty(value = "标准合同是否审核完成(AUDIT:审核中,PASS:审核通过,REFUSE:已驳回,CANCEL:已取消)")
     private String standardApproved;
 
+    /**
+     * 标准合同审批人ID
+     */
+    @ApiModelProperty(value = "标准合同审批人ID")
+    private String standardApproverId;
+
+    /**
+     * 标准合同审批完成时间
+     */
+    @ApiModelProperty(value = "标准合同审批完成时间")
+    private LocalDateTime standardTime;
+
     public GetContractDistributorStandardBo() {
 
     }

@@ -151,6 +151,12 @@ public class QueryContractDistributorStandardBo extends BaseBo<ContractDistribut
     @ApiModelProperty(value = "标准合同是否审核完成(AUDIT:审核中,PASS:审核通过,REFUSE:已驳回,CANCEL:已取消)")
     private String standardApproved;
 
+    /**
+     * 是否展示审核按钮(非持久化字段)
+     */
+    @ApiModelProperty(value = "是否展示审核按钮")
+    private Boolean showExamine;
+
     public QueryContractDistributorStandardBo() {
 
     }

@@ -133,6 +133,11 @@ public class ContractDistributorStandard extends BaseEntity implements BaseDto {
     private String performance;
 
     /**
+     * 元素
+     */
+    private String component;
+
+    /**
      * 包装
      */
     private String packaging;
@@ -193,6 +198,16 @@ public class ContractDistributorStandard extends BaseEntity implements BaseDto {
     private String formalApproved;
 
     /**
+     * 正式合同审批人ID
+     */
+    private String formalApproverId;
+
+    /**
+     * 正式合同审批完成时间
+     */
+    private LocalDateTime formalTime;
+
+    /**
      * 标准合同文件ID
      */
     private String standardFileId;
@@ -213,6 +228,16 @@ public class ContractDistributorStandard extends BaseEntity implements BaseDto {
     private String standardApproved;
 
     /**
+     * 标准合同审批人ID
+     */
+    private String standardApproverId;
+
+    /**
+     * 标准合同审批完成时间
+     */
+    private LocalDateTime standardTime;
+
+    /**
      * 创建人ID
      */
     @TableField(fill = FieldFill.INSERT)
@@ -263,4 +288,10 @@ public class ContractDistributorStandard extends BaseEntity implements BaseDto {
      */
     private BigDecimal totalAmountIncludingTax;
 
+    /**
+     * 是否展示审核按钮(非持久化字段)
+     */
+    @TableField(exist = false)
+    private Boolean showExamine;
+
 }

 package com.lframework.xingyun.sc.handlers;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.lframework.starter.bpm.dto.FlowInstanceExtDto;
 import com.lframework.starter.bpm.enums.FlowInstanceStatus;
 import com.lframework.starter.bpm.service.BusinessDataHandlerService;
@@ -9,6 +7,7 @@ import com.lframework.starter.web.core.components.redis.RedisHandler;
 import com.lframework.starter.web.core.utils.JsonUtil;
 import com.lframework.xingyun.sc.entity.CorePersonnelHistory;
 import com.lframework.xingyun.sc.enums.CustomerDevelopStatus;
+import com.lframework.xingyun.sc.service.contract.ContractDistributorStandardService;
 import com.lframework.xingyun.sc.service.customer.CorePersonnelHistoryService;
 import com.lframework.xingyun.sc.service.customer.CustomerCreditHistoryService;
 import com.lframework.xingyun.sc.service.customer.CustomerCreditService;
@@ -44,12 +43,14 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
     private CorePersonnelHistoryService corePersonnelHistoryService;
     @Autowired
     private RedisHandler redisHandler;
+    @Resource
+    private ContractDistributorStandardService contractDistributorStandardService;
 
 
     /**
      * 业务状态数据处理器
      *
-     * @param listenerVariable  流程变量
+     * @param listenerVariable 流程变量
      */
     @Override
     public void businessStatusHandler(ListenerVariable listenerVariable) {
@@ -80,17 +81,48 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
             case "CUSTOMER_CREDIT":
                 handleCustomerCreditData(flowStatus, businessId);
                 break;
+            case "FORMAL_CONTRACT":
+                handleFormalContractAuditData(flowStatus, businessId);
+                break;
+            case "STANDARD_CONTRACT":
+                handleStandardContractAuditData(flowStatus, businessId);
+                break;
             default:
                 break;
         }
         log.info("==================== 业务状态数据处理结束......");
     }
 
+    private void handleFormalContractAuditData(String flowStatus, String businessId) {
+        if (FlowInstanceStatus.APPROVE_PASS.getCode().equals(flowStatus)
+                || FlowInstanceStatus.FINISH.getCode().equals(flowStatus)) {
+            contractDistributorStandardService.updateFormalContractStatus(businessId, "PASS");
+        } else if (FlowInstanceStatus.REVOKE.getCode().equals(flowStatus)
+                || FlowInstanceStatus.REFUSE.getCode().equals(flowStatus)
+                || FlowInstanceStatus.TERMINATION.getCode().equals(flowStatus)) {
+            contractDistributorStandardService.updateFormalContractStatus(businessId, "REFUSE");
+        } else if (FlowInstanceStatus.UNDO.getCode().equals(flowStatus)) {
+            contractDistributorStandardService.updateFormalContractStatus(businessId, "CANCEL");
+        }
+    }
+
+    private void handleStandardContractAuditData(String flowStatus, String businessId) {
+        if (FlowInstanceStatus.APPROVE_PASS.getCode().equals(flowStatus)
+                || FlowInstanceStatus.FINISH.getCode().equals(flowStatus)) {
+            contractDistributorStandardService.updateStandardContractStatus(businessId, "PASS");
+        } else if (FlowInstanceStatus.REVOKE.getCode().equals(flowStatus)
+                || FlowInstanceStatus.REFUSE.getCode().equals(flowStatus)
+                || FlowInstanceStatus.TERMINATION.getCode().equals(flowStatus)) {
+            contractDistributorStandardService.updateStandardContractStatus(businessId, "REFUSE");
+        } else if (FlowInstanceStatus.UNDO.getCode().equals(flowStatus)) {
+            contractDistributorStandardService.updateStandardContractStatus(businessId, "CANCEL");
+        }
+    }
 
     /**
      * 客户开发业务数据处理
      *
-     * @param businessId        业务ID
+     * @param businessId 业务ID
      */
     private void handleCustomerDevelopData(String flowStatus, String businessId) {
         if (FlowInstanceStatus.APPROVE_PASS.getCode().equals(flowStatus)

@@ -4,7 +4,11 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.PageInfo;
+import com.lframework.starter.bpm.dto.FlowTaskDto;
+import com.lframework.starter.bpm.mappers.FlowTaskWrapperMapper;
 import com.lframework.starter.bpm.service.FlowInstanceWrapperService;
+import com.lframework.starter.bpm.vo.flow.task.QueryTodoTaskListVo;
+import com.lframework.starter.web.core.components.security.SecurityUtil;
 import com.lframework.xingyun.sc.entity.ContractDistributorLine;
 import com.lframework.xingyun.sc.entity.ContractDistributorStandard;
 import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
@@ -35,9 +39,13 @@ import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.io.Serializable;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 @Service
@@ -51,6 +59,8 @@ public class ContractDistributorStandardServiceImpl extends
     private ContractDistributorLineService contractDistributorLineService;
     @Autowired
     private FlowInstanceWrapperService flowInstanceWrapperService;
+    @Resource
+    private FlowTaskWrapperMapper flowTaskWrapperMapper;
 
 
     @Override
@@ -61,6 +71,22 @@ public class ContractDistributorStandardServiceImpl extends
 
         PageHelperUtil.startPage(pageIndex, pageSize);
         List<ContractDistributorStandard> datas = this.query(vo);
+        if (CollectionUtils.isEmpty(datas)) {
+            return PageResultUtil.convert(new PageInfo<>(datas));
+        }
+
+        // 获取当前人员的待办任务数据
+        List<FlowTaskDto> flowTaskList = flowTaskWrapperMapper.queryTodoList(new QueryTodoTaskListVo(), SecurityUtil.getCurrentUser().getId());
+        if (CollectionUtils.isEmpty(flowTaskList)) {
+            return PageResultUtil.convert(new PageInfo<>(datas));
+        }
+
+        Set<String> ids = flowTaskList.stream()
+                .map(FlowTaskDto::getBusinessId)
+                .collect(Collectors.toSet());
+        for (ContractDistributorStandard standard : datas) {
+            standard.setShowExamine(ids.contains(standard.getId()));
+        }
 
         return PageResultUtil.convert(new PageInfo<>(datas));
     }
@@ -105,6 +131,7 @@ public class ContractDistributorStandardServiceImpl extends
         data.setSurface(vo.getSurface());
         data.setTolerance(vo.getTolerance());
         data.setPerformance(vo.getPerformance());
+        data.setComponent(vo.getComponent());
         data.setPackaging(vo.getPackaging());
         data.setSpecialTerms(vo.getSpecialTerms());
         data.setDesignatedConsignee(vo.getDesignatedConsignee());
@@ -161,6 +188,7 @@ public class ContractDistributorStandardServiceImpl extends
                 .set(ContractDistributorStandard::getSurface, vo.getSurface())
                 .set(ContractDistributorStandard::getTolerance, vo.getTolerance())
                 .set(ContractDistributorStandard::getPerformance, vo.getPerformance())
+                .set(ContractDistributorStandard::getComponent, vo.getComponent())
                 .set(ContractDistributorStandard::getPackaging, vo.getPackaging())
                 .set(ContractDistributorStandard::getSpecialTerms, vo.getSpecialTerms())
                 .set(ContractDistributorStandard::getDesignatedConsignee, vo.getDesignatedConsignee())
@@ -258,6 +286,56 @@ public class ContractDistributorStandardServiceImpl extends
         flowInstanceWrapperService.startInstance(FORMAL_FLAG, data.getId(), FORMAL_FLAG, data);
     }
 
+    @Override
+    @OpLog(type = OtherOpLogType.class, name = "正式合同附件审批完成，ID：{}， 审批状态：{}", params = {"#id", "#formalApproved"})
+    @Transactional(rollbackFor = Exception.class)
+    public void updateFormalContractStatus(String id, String formalApproved) {
+        if (StringUtils.isBlank(id) || StringUtils.isBlank(formalApproved)) {
+            return;
+        }
+
+        Wrapper<ContractDistributorStandard> wrapper = Wrappers.lambdaUpdate(ContractDistributorStandard.class)
+                .set(ContractDistributorStandard::getFormalApproved, formalApproved)
+                .set(ContractDistributorStandard::getFormalApproverId, SecurityUtil.getCurrentUser().getId())
+                .set(ContractDistributorStandard::getFormalTime, LocalDateTime.now())
+                .eq(ContractDistributorStandard::getId, id);
+
+        getBaseMapper().update(wrapper);
+
+        UpdateContractDistributorStandardVo vo = new UpdateContractDistributorStandardVo();
+        vo.setId(id);
+        vo.setFormalApproved(formalApproved);
+        vo.setFormalTime(LocalDateTime.now());
+        vo.setFormalApproved(SecurityUtil.getCurrentUser().getId());
+        OpLogUtil.setVariable("id", id);
+        OpLogUtil.setExtra(vo);
+    }
+
+    @Override
+    @OpLog(type = OtherOpLogType.class, name = "标准合同附件审批完成，ID：{}， 审批状态：{}", params = {"#id", "#standardApproved"})
+    @Transactional(rollbackFor = Exception.class)
+    public void updateStandardContractStatus(String id, String standardApproved) {
+        if (StringUtils.isBlank(id) || StringUtils.isBlank(standardApproved)) {
+            return;
+        }
+
+        Wrapper<ContractDistributorStandard> wrapper = Wrappers.lambdaUpdate(ContractDistributorStandard.class)
+                .set(ContractDistributorStandard::getStandardApproved, standardApproved)
+                .set(ContractDistributorStandard::getStandardApproverId, SecurityUtil.getCurrentUser().getId())
+                .set(ContractDistributorStandard::getStandardTime, LocalDateTime.now())
+                .eq(ContractDistributorStandard::getId, id);
+
+        getBaseMapper().update(wrapper);
+
+        UpdateContractDistributorStandardVo vo = new UpdateContractDistributorStandardVo();
+        vo.setId(id);
+        vo.setStandardApproved(standardApproved);
+        vo.setStandardTime(LocalDateTime.now());
+        vo.setStandardApproved(SecurityUtil.getCurrentUser().getId());
+        OpLogUtil.setVariable("id", id);
+        OpLogUtil.setExtra(vo);
+    }
+
     @CacheEvict(value = ContractDistributorStandard.CACHE_NAME, key = "@cacheVariables.tenantId() + #key")
     @Override
     public void cleanCacheByKey(Serializable key) {

@@ -59,4 +59,8 @@ public interface ContractDistributorStandardService extends BaseMpService<Contra
      */
     void uploadFormalContract(UpdateContractDistributorStandardVo vo);
 
+    void updateFormalContractStatus(String id, String formalApproved);
+
+    void updateStandardContractStatus(String id, String standardApproved);
+
 }
\ No newline at end of file

@@ -167,6 +167,13 @@ public class CreateContractDistributorStandardVo implements BaseVo, Serializable
     private String performance;
 
     /**
+     * 元素
+     */
+    @ApiModelProperty(value = "元素")
+    @Length(message = "元素最多允许65,535个字符！")
+    private String component;
+
+    /**
      * 包装
      */
     @ApiModelProperty(value = "包装")

@@ -15,6 +15,7 @@ import io.swagger.annotations.ApiModelProperty;
 import org.hibernate.validator.constraints.Length;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 import java.util.List;
 
 @Data
@@ -169,6 +170,13 @@ public class UpdateContractDistributorStandardVo implements BaseVo, Serializable
     private String performance;
 
     /**
+     * 元素
+     */
+    @ApiModelProperty(value = "元素")
+    @Length(message = "元素最多允许65,535个字符！")
+    private String component;
+
+    /**
      * 包装
      */
     @ApiModelProperty(value = "包装")
@@ -275,6 +283,18 @@ public class UpdateContractDistributorStandardVo implements BaseVo, Serializable
     private String formalApproved;
 
     /**
+     * 正式合同审批人ID
+     */
+    @ApiModelProperty(value = "正式合同审批人ID")
+    private String formalApproverId;
+
+    /**
+     * 正式合同审批完成时间
+     */
+    @ApiModelProperty(value = "正式合同审批完成时间")
+    private LocalDateTime formalTime;
+
+    /**
      * 标准合同文件ID
      */
     @ApiModelProperty(value = "标准合同文件ID")
@@ -298,4 +318,16 @@ public class UpdateContractDistributorStandardVo implements BaseVo, Serializable
      */
     @ApiModelProperty(value = "标准合同是否审核完成(AUDIT:审核中,PASS:审核通过,REFUSE:已驳回,CANCEL:已取消)")
     private String standardApproved;
+
+    /**
+     * 标准合同审批人ID
+     */
+    @ApiModelProperty(value = "标准合同审批人ID")
+    private String standardApproverId;
+
+    /**
+     * 标准合同审批完成时间
+     */
+    @ApiModelProperty(value = "标准合同审批完成时间")
+    private LocalDateTime standardTime;
 }

@@ -24,6 +24,7 @@
         <result column="surface" property="surface"/>
         <result column="tolerance" property="tolerance"/>
         <result column="performance" property="performance"/>
+        <result column="component" property="component"/>
         <result column="packaging" property="packaging"/>
         <result column="special_terms" property="specialTerms"/>
         <result column="designated_consignee" property="designatedConsignee"/>
@@ -45,10 +46,14 @@
         <result column="formal_file_name" property="formalFileName"/>
         <result column="formal_standardized" property="formalStandardized"/>
         <result column="formal_approved" property="formalApproved"/>
+        <result column="formal_approver_id" property="formalApproverId"/>
+        <result column="formal_time" property="formalTime"/>
         <result column="standard_file_id" property="standardFileId"/>
         <result column="standard_file_name" property="standardFileName"/>
         <result column="standard_standardized" property="standardStandardized"/>
         <result column="standard_approved" property="standardApproved"/>
+        <result column="standard_approver_id" property="standardApproverId"/>
+        <result column="standard_time" property="standardTime"/>
     </resultMap>
 
     <sql id="ContractDistributorStandard_sql">
@@ -74,6 +79,7 @@
             tb.surface,
             tb.tolerance,
             tb.performance,
+            tb.component,
             tb.packaging,
             tb.special_terms,
             tb.designated_consignee,
@@ -95,10 +101,14 @@
             tb.formal_file_name,
             tb.formal_standardized,
             tb.formal_approved,
+            tb.formal_approver_id,
+            tb.formal_time,
             tb.standard_file_id,
             tb.standard_file_name,
             tb.standard_standardized,
-            tb.standard_approved
+            tb.standard_approved,
+            tb.standard_approver_id,
+            tb.standard_time
         FROM tbl_contract_distributor_standard AS tb
     </sql>