提交整改单修改

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/Enum/RectificationStatusEnum.java

+package com.yeejoin.amos.boot.module.hygf.api.Enum;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @description: 整改单状态枚举
+ */
+@Getter
+@AllArgsConstructor
+@SuppressWarnings("ALL")
+public enum RectificationStatusEnum {
+
+    待提交验收("待整改", 1),
+
+    待投融验收("整改未完成", 2),
+
+    投融验收不通过("整改已完成", 3);
+
+
+    /**
+     * 名称，描述
+     */
+    private final String name;
+    /**
+     * 编码
+     */
+    private final int code;
+
+    public static RectificationStatusEnum getNodeByCode(int code) {
+        RectificationStatusEnum anEnum = null;
+        for (RectificationStatusEnum type : RectificationStatusEnum.values()) {
+            if (type.getCode() == code) {
+                anEnum = type;
+                break;
+            }
+        }
+        return anEnum;
+    }
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/AcceptanceRectificationOrderDto.java

 package com.yeejoin.amos.boot.module.hygf.api.dto;
 
 import com.alibaba.fastjson.JSONArray;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
@@ -47,6 +49,7 @@ public class AcceptanceRectificationOrderDto extends BaseDto {
     private String rectificationDescription;
 
     @ApiModelProperty(value = "完成日期")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date completeDate;
 
     @ApiModelProperty(value = "负责人ID")

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/AcceptanceMapper.xml

@@ -40,7 +40,8 @@
                     AND ph.peasant_household_no = #{param.powerStationCode}
                 </if>
                 <if test="param.acceptanceStatus != null and param.acceptanceStatus != ''">
-                    AND JSON_SEARCH(#{param.acceptanceStatus}, 'ALL', bga.acceptance_status) IS NOT NULL
+--                     AND JSON_SEARCH(#{param.acceptanceStatus}, 'ALL', bga.acceptance_status) IS NOT NULL
+                    AND bga.acceptance_status = #{acceptanceStatus}
                 </if>
                 <if test="param.startSubmitDate != null and param.startSubmitDate != ''">
                     AND bga.acceptance_rec_date &gt;= #{param.startSubmitDate}

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/AcceptanceRectificationOrderServiceImpl.java

 package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
+import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.module.hygf.api.Enum.RectificationStatusEnum;
 import com.yeejoin.amos.boot.module.hygf.api.dto.AcceptanceRectificationOrderDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.StandardDto;
+import com.yeejoin.amos.boot.module.hygf.api.dto.VariableDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.AcceptanceRectificationOrder;
 import com.yeejoin.amos.boot.module.hygf.api.entity.BasicGridAcceptance;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.AcceptanceRectificationOrderMapper;
@@ -16,8 +22,11 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -36,13 +45,15 @@ public class AcceptanceRectificationOrderServiceImpl extends BaseService<Accepta
     private BasicGridAcceptanceMapper basicGridAcceptanceMapper;
     @Autowired
     private WorkflowImpl workflow;
+    @Autowired
+    private RedisUtils redisUtils;
 
     /**
      * 分页查询
      */
     public Page<AcceptanceRectificationOrderDto> queryForAcceptanceRectificationOrderPage(Page<AcceptanceRectificationOrderDto> page, Long acceptanceSeqNbr) {
         Page<AcceptanceRectificationOrderDto> resultPage = acceptanceRectificationOrderMapper.page(page, acceptanceSeqNbr);
-        resultPage.getRecords().forEach(v -> v.setRectificationStatusDesc("0".equals(v.getRectificationStatus()) ? "待整改" : "整改完成"));
+        resultPage.getRecords().forEach(v -> v.setRectificationStatusDesc(RectificationStatusEnum.getNodeByCode(Integer.parseInt(v.getRectificationStatus())).getName()));
         return resultPage;
     }
 
@@ -77,6 +88,8 @@ public class AcceptanceRectificationOrderServiceImpl extends BaseService<Accepta
      * 提交整改并触发工作流
      */
     public AcceptanceRectificationOrderDto updateAndDriveWorkflow(AcceptanceRectificationOrderDto model) {
+        ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+
         // 提交整改信息
         AcceptanceRectificationOrder entity = new AcceptanceRectificationOrder();
         BeanUtils.copyProperties(model, entity);
@@ -88,8 +101,17 @@ public class AcceptanceRectificationOrderServiceImpl extends BaseService<Accepta
                         .eq(BasicGridAcceptance::getWorkOrderPowerStationId, entity.getWorkOrderPowerStationId())
         );
         basicGridAcceptance.setAcceptanceStatus(String.valueOf(Integer.parseInt(basicGridAcceptance.getAcceptanceStatus()) - 1));
+
         StandardDto standardDto = new StandardDto();
-        // TODO: standardDto setter
+        standardDto.setTaskId(basicGridAcceptance.getNextTaskId());
+//        VariableDto variableDto = new VariableDto();
+//        variableDto.setComment("approval");
+//        variableDto.setOperator(reginParams.getUserModel().getUserId());
+//        variableDto.setApprovalStatus("1");
+//        variableDto.setOperationTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+//        standardDto.setResultCode(basicGridAcceptance.getNextTaskId());
+//        standardDto.setVariable(variableDto);
+//        standardDto.setResult("1");
         BasicGridAcceptance workBasicGridAcceptance = workflow.standard(basicGridAcceptance, standardDto);
         BeanUtils.copyProperties(workBasicGridAcceptance, basicGridAcceptance);
 

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/AcceptanceServiceImpl.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.AcceptanceStatusEnum;
+import com.yeejoin.amos.boot.module.hygf.api.Enum.RectificationStatusEnum;
 import com.yeejoin.amos.boot.module.hygf.api.dto.AcceptanceCheckItemDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.AcceptanceDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.AcceptanceCheckItem;
@@ -63,9 +64,10 @@ public class AcceptanceServiceImpl implements IAcceptanceService {
         }
         IPage<AcceptanceDto> resultPage = acceptanceMapper.page(page, acceptanceDto);
         resultPage.getRecords().forEach(v -> {
-            AcceptanceStatusEnum statusEnum = AcceptanceStatusEnum.getNodeByCode(v.getAcceptanceStatus());
-            v.setAcceptanceStatusDesc(statusEnum.getName());
-            v.setRectificationStatusDesc("0".equals(v.getAcceptanceStatus()) ? "待整改" : "整改完成");
+            AcceptanceStatusEnum acceptanceStatusEnum = AcceptanceStatusEnum.getNodeByCode(v.getAcceptanceStatus());
+            RectificationStatusEnum rectificationStatusEnum = RectificationStatusEnum.getNodeByCode(Integer.parseInt(v.getRectificationStatus()));
+            v.setAcceptanceStatusDesc(acceptanceStatusEnum.getName());
+            v.setRectificationStatusDesc(rectificationStatusEnum.getName());
         });
         return resultPage;
     }