ci: 法规符合性排查流程-基础字段注解补全

laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/controller/ProcessStandardComplianceCheckController.java

@@ -8,7 +8,6 @@ import com.jero.modules.activiti.enums.ProcessTypeEnum;
 import com.jero.modules.activiti.process.common.entity.ProcessDraft;
 import com.jero.modules.activiti.process.common.entity.TransferVO;
 import com.jero.modules.activiti.process.common.service.ActFlowCommonService;
-import com.jero.modules.activiti.process.demo.vo.ProcessDemoVO;
 import com.jero.modules.activiti.process.fb.service.IProcessHandleService;
 import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO;
 import com.jero.modules.activiti.process.standardComplianceCheck.entity.ProcessStandardComplianceCheck;
@@ -20,6 +19,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.ss.formula.functions.T;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 
@@ -104,5 +104,17 @@ public class ProcessStandardComplianceCheckController extends JeroController<Pro
         return Result.OK(sccService.getHandleData(taskId));
     }
 
+    /**
+     * 生成
+     * @param scc
+     */
+    @AutoLog(value = "法规符合性排查流程-生成")
+    @ApiOperation(value="法规符合性排查流程-生成", notes="法规符合性排查流程-生成")
+    @PostMapping("/generate")
+    @Translation
+    public Result<?> generate(@RequestPart("scc") ProcessStandardComplianceCheck scc,
+                              @RequestPart("file") MultipartFile file) {
+        return Result.OK(sccService.generate(scc, file));
+    }
 
 }

laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheck.java

@@ -4,9 +4,16 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 /**
  * 
@@ -14,91 +21,104 @@ import lombok.Data;
  */
 @TableName(value ="process_standard_compliance_check")
 @Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="process_standard_compliance_check对象", description="法规符合性排查流程-主表")
 public class ProcessStandardComplianceCheck implements Serializable {
-    /**
+
-     * 主键ID
+    /**主键*/
-     */
+    @TableId(type = IdType.ASSIGN_ID)
-    @TableId
+    @ApiModelProperty(value = "主键")
     private String id;
 
     /**
      * 标准ID
      */
+    @ApiModelProperty(value = "标准ID")
     private String standardId;
 
     /**
      * 标准编号
      */
+    @ApiModelProperty(value = "标准编号")
     private String standardNumber;
 
     /**
      * 标准名称
      */
+    @ApiModelProperty(value = "标准名称")
     private String standardName;
 
     /**
-     * 标准状态(1-草案、2-征求意见稿、3-送审稿、4-报批稿、5-发布稿、5-修改单)
+     * 标准状态
      */
+    @ApiModelProperty(value = "标准状态")
     private String standardState;
 
     /**
      * 流程实例id
      */
+    @ApiModelProperty(value = "流程实例id")
     private String processInstanceId;
 
-    /**
+    /**创建人*/
-     * 创建人ID
+    @ApiModelProperty(value = "创建人")
-     */
     private String createBy;
 
-    /**
+    /**创建日期*/
-     * 创建时间
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-     */
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
     private Date createTime;
 
-    /**
+    /**更新人*/
-     * 修改人ID
+    @ApiModelProperty(value = "更新人")
-     */
     private String updateBy;
 
-    /**
+    /**更新日期*/
-     * 修改时间
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-     */
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
     private Date updateTime;
 
-    /**
+    /**所属部门*/
-     * 部门code
+    @ApiModelProperty(value = "所属部门")
-     */
     private String orgCode;
 
     /**
      * 父级流程实例Id
      */
+    @ApiModelProperty(value = "父级流程实例Id")
     private String parentInstanceId;
 
     /**
      * 新生产车实施日期
      */
+    @ApiModelProperty(value = "新生产车实施日期")
     private Date newProductImplDate;
 
     /**
      * 新认证车实施日期
      */
+    @ApiModelProperty(value = "新认证车实施日期")
     private Date newAuthImplDate;
 
     /**
      * 分解单来源
      */
+    @ApiModelProperty(value = "分解单来源")
     private String splitFileSource;
 
     /**
      * 适用市场
      */
+    @ApiModelProperty(value = "适用市场")
     private String applicableMarket;
 
     /**
      * 是否与上一版相同
      */
+    @ApiModelProperty(value = "是否与上一版相同")
     private String isSameLastVersion;
 
     @TableField(exist = false)

laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheckDetail.java

@@ -4,9 +4,16 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 /**
  * 
@@ -14,131 +21,154 @@ import lombok.Data;
  */
 @TableName(value ="process_standard_compliance_check_detail")
 @Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="process_standard_compliance_check对象", description="法规符合性排查流程-子表")
 public class ProcessStandardComplianceCheckDetail implements Serializable {
+
     /**
      * 主键ID
      */
-    @TableId
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
     private String id;
 
-    /**
+    /**创建人*/
-     * 创建人ID
+    @ApiModelProperty(value = "创建人")
-     */
     private String createBy;
 
-    /**
+    /**创建日期*/
-     * 创建时间
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-     */
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
     private Date createTime;
 
-    /**
+    /**更新人*/
-     * 修改人ID
+    @ApiModelProperty(value = "更新人")
-     */
     private String updateBy;
 
-    /**
+    /**更新日期*/
-     * 修改时间
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-     */
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
     private Date updateTime;
 
-    /**
+    /**所属部门*/
-     * 部门code
+    @ApiModelProperty(value = "所属部门")
-     */
     private String orgCode;
 
     /**
      * 流程实例id
      */
+    @ApiModelProperty(value = "流程实例id")
     private String processInstanceId;
 
     /**
      * 条款号
      */
+    @ApiModelProperty(value = "条款号")
     private String termNumber;
 
     /**
      * 条款内容
      */
+    @ApiModelProperty(value = "条款内容")
     private String termContent;
 
     /**
      * 车型
      */
+    @ApiModelProperty(value = "车型")
     private String model;
 
     /**
      * 车型状态
      */
+    @ApiModelProperty(value = "车型状态")
     private String modelState;
 
     /**
      * 合规评估结果
      */
+    @ApiModelProperty(value = "合规评估结果")
     private String result;
 
     /**
      * 问题描述
      */
+    @ApiModelProperty(value = "问题描述")
     private String description;
 
     /**
      * 佐证材料
      */
+    @ApiModelProperty(value = "佐证材料")
     private String material;
 
     /**
      * 评估日期
      */
+    @ApiModelProperty(value = "评估日期")
     private Date valuationTime;
 
     /**
      * 整改方案
      */
+    @ApiModelProperty(value = "整改方案")
     private String correctionSolution;
 
     /**
      * 不满足要求的现状
      */
-    private String unsatisfyRequire;
+    @ApiModelProperty(value = "不满足要求的现状")
+    private String unsatisfiedRequire;
 
     /**
      * 整改周期
      */
+    @ApiModelProperty(value = "整改周期")
     private String correctionCycle;
 
     /**
      * 整改费用
      */
+    @ApiModelProperty(value = "整改费用")
     private String correctionCost;
 
     /**
      * 与其他项目共用性
      */
+    @ApiModelProperty(value = "与其他项目共用性")
     private String commonality;
 
     /**
      * 共用后本项目所需费用
      */
+    @ApiModelProperty(value = "共用后本项目所需费用")
     private String commonalityCost;
 
     /**
      * 备注
      */
+    @ApiModelProperty(value = "备注")
     private String remark;
 
     /**
      * 责任部门
      */
+    @ApiModelProperty(value = "责任部门")
     private String authDept;
 
     /**
      * 主排查人
      */
+    @ApiModelProperty(value = "主排查人")
     private String mainCheckUser;
 
     /**
      * 设计工程师
      */
+    @ApiModelProperty(value = "设计工程师")
     private String designEngineer;
 
     @TableField(exist = false)

laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/vo/ModelExcelVO.java

@@ -0,0 +1,12 @@
+package com.jero.modules.activiti.process.standardComplianceCheck.entity.vo;
+
+import lombok.Data;
+
+@Data
+public class ModelExcelVO {
+
+    private String model;
+
+    private String modelState;
+
+}

laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/vo/ProcessSccVO.java

@@ -1,8 +1,17 @@
 package com.jero.modules.activiti.process.standardComplianceCheck.entity.vo;
 
 
+import com.jero.modules.activiti.process.standardComplianceCheck.entity.ProcessStandardComplianceCheck;
+import com.jero.modules.activiti.process.standardComplianceCheck.entity.ProcessStandardComplianceCheckDetail;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class ProcessSccVO {
+
+    ProcessStandardComplianceCheck standardInfo;
+
+    List<ProcessStandardComplianceCheckDetail> detailInfoList;
+
 }

laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/IProcessStandardComplianceCheckService.java

@@ -1,10 +1,13 @@
 package com.jero.modules.activiti.process.standardComplianceCheck.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO;
 import com.jero.modules.activiti.process.standardComplianceCheck.entity.ProcessStandardComplianceCheck;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.jero.modules.activiti.process.standardComplianceCheck.entity.vo.ProcessSccVO;
 import org.activiti.engine.delegate.DelegateTask;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
 
 /**
 * @author ThinkBook
@@ -22,4 +25,6 @@ public interface IProcessStandardComplianceCheckService extends IService<Process
     void createAutoTaskListener(DelegateTask delegateTask);
 
     void submit(ProcessInfoVO<ProcessSccVO> processInfoVO);
+
+    List<ProcessStandardComplianceCheck> generate(ProcessStandardComplianceCheck scc, MultipartFile file);
 }

laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java

@@ -17,6 +17,7 @@ import com.jero.modules.activiti.process.fb.dto.BasicTaskInfoDTO;
 import com.jero.modules.activiti.process.fb.service.IProcessHandleService;
 import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO;
 import com.jero.modules.activiti.process.standardComplianceCheck.entity.ProcessStandardComplianceCheck;
+import com.jero.modules.activiti.process.standardComplianceCheck.entity.ProcessStandardComplianceCheckDetail;
 import com.jero.modules.activiti.process.standardComplianceCheck.entity.vo.ProcessSccVO;
 import com.jero.modules.activiti.process.standardComplianceCheck.mapper.ProcessStandardComplianceCheckMapper;
 import com.jero.modules.activiti.process.standardComplianceCheck.service.IProcessStandardComplianceCheckService;
@@ -29,6 +30,7 @@ import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.task.Task;
 import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import java.util.HashMap;
@@ -91,10 +93,8 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
         processInfo.setProcessInstanceId(processInstanceId);
         processInfo.setProcessDefinitionId(processDefinitionId);
         processInfo.setProcessType(ProcessTypeEnum.STANDARD_COMPLIANCE_CHECK.getValue());
-        // 保存数据
+        // 第一个节点业务数据处理
-//        dataList.forEach(data -> data.setProcessInstanceId(processInstanceId));
+        this.startNodeBusProcess(processInfoVO);
-//        dataList.forEach(ProcessEsAnnualInit::setDateEditFlag);
-//        saveOrUpdateBatch(dataList);
         // 保存选人信息
         processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, this.getUserMap(userInfoMap));
         // 获取第一个任务的taskId
@@ -109,6 +109,17 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
         actFlowCommonService.updateProcessAll(processInfo);
     }
 
+    /**
+     * 第一个节点业务数据处理
+     * @param processInfoVO
+     */
+    private void startNodeBusProcess(ProcessInfoVO<ProcessSccVO> processInfoVO) {
+        ProcessSccVO businessInfoDTO = processInfoVO.getBusinessInfoDTO();
+        ProcessStandardComplianceCheck standardInfo = businessInfoDTO.getStandardInfo();
+        List<ProcessStandardComplianceCheckDetail> detailInfoList = businessInfoDTO.getDetailInfoList();
+
+    }
+
     private Map<String, Object> setVariables(ProcessSccVO businessInfoDTO) {
         // TODO 转List
         return new HashMap<>();
@@ -161,6 +172,14 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
 
     }
 
+
+
+    @Override
+    public List<ProcessStandardComplianceCheck> generate(ProcessStandardComplianceCheck scc, MultipartFile file) {
+
+        return null;
+    }
+
     @Override
     public ProcessInfoVO<ProcessSccVO> getHandleData(String taskId) {
         if (!actFlowCommonService.taskExists(taskId)) {