放款详情附件修改

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

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.hygf.api.dto;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.alibaba.fastjson.support.spring.annotation.FastJsonFilter;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
@@ -37,13 +38,14 @@ public class FinancingInfoDto  extends BaseDto {
     private Long peasantHouseholdId;
 
     @ApiModelProperty(value = "放款时间")
-    private String disbursementTime;
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
+    private Date disbursementTime;
 
     @ApiModelProperty(value = "元")
     private Double disbursementMoney;
 
     @ApiModelProperty(value = "附件")
-    private List<Object> file;
+    private String file;
 
     @ApiModelProperty(value = "状态")
     private String status;
@@ -53,4 +55,7 @@ public class FinancingInfoDto  extends BaseDto {
 
    private String instanceId;
 
+ @ApiModelProperty(value = "附件")
+ private List<Object> files;
+
 }

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/FinancingInfoController.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.hygf.biz.controller;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.map.MapBuilder;
+import com.alibaba.fastjson.JSON;
 import com.yeejoin.amos.boot.module.hygf.api.util.CommonResponseNewUtil;
 import com.yeejoin.amos.boot.module.hygf.api.util.CommonResponseUtil;
 import org.springframework.beans.BeanUtils;
@@ -62,6 +63,7 @@ public class FinancingInfoController extends BaseController {
 	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
 	public ResponseModel<FinancingInfoDto> updateBySequenceNbrFinancingInfo(@RequestBody FinancingInfoDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
 	    model.setSequenceNbr(sequenceNbr);
+		model.setFile(JSON.toJSONString(model.getFiles()));
 		financingInfoServiceImpl.updateWithModel(model);
 		if (null != model.getDisbursementMoney()){
 			Map<String, Object> map = BeanUtil.beanToMap(model);

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

 package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
@@ -17,6 +18,8 @@ import com.yeejoin.amos.boot.module.hygf.api.entity.FinancingInfo;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.FinancingInfoMapper;
 import com.yeejoin.amos.boot.module.hygf.api.service.IFinancingInfoService;
 import com.yeejoin.amos.boot.module.hygf.api.dto.FinancingInfoDto;
+import com.yeejoin.amos.boot.module.jxiop.api.entity.FinancingRectificationOrder;
+import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.FinancingRectificationOrderServiceImpl;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowBatchDTO;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
 import com.yeejoin.amos.feign.workflow.model.ProcessTaskDTO;
@@ -50,6 +53,8 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto,Finan
     private  WorkflowImpl workflow;
     @Autowired
     private FinancingAuditingServiceImpl financingAuditingService;
+    @Autowired
+    private FinancingRectificationOrderServiceImpl financingRectificationOrderService;
 
     private static  String  PROCESSKEY="StationFinancing";
 
@@ -142,7 +147,9 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto,Finan
 
     @Override
     public FinancingInfoDto selectDataInfo(Long peasantHouseholdId) {
-        return this.getBaseMapper().selectDataInfo(peasantHouseholdId);
+        FinancingInfoDto financingInfoDto = this.getBaseMapper().selectDataInfo(peasantHouseholdId);
+        financingInfoDto.setFiles(JSONArray.parseArray(financingInfoDto.getFile()));
+        return financingInfoDto;
     }
 
     @Override
@@ -174,7 +181,8 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto,Finan
         }
         financingAuditingService.createWithModel(financingAuditingDto);
 
-        String statusName = FinancingAuditEnum.getNameByCode(workflowResultDto.getNextNodeKey());
+        String nameByCode = FinancingAuditEnum.getNameByCode(workflowResultDto.getNextNodeKey());
+        String statusName = nameByCode == null || nameByCode.equals("") ?"放款完成":nameByCode;
 
         LambdaQueryWrapper<FinancingInfo> info = new LambdaQueryWrapper<>();
         info.eq(FinancingInfo::getPeasantHouseholdId,financingAuditing.getPeasantHouseholdId());
@@ -184,7 +192,12 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto,Finan
         this.updateById(financingInfo);
 
         if (params.get("approvalStatus").equals("7")){
-
+            FinancingRectificationOrder financingRectificationOrder = new FinancingRectificationOrder();
+          financingRectificationOrder.setRectificationOrderCode(String.valueOf(new Date().getTime()));
+          financingRectificationOrder.setRectificationStatus("待整改");
+          financingRectificationOrder.setRectificationDescription(params.getOrDefault("rectificationDescription","").toString());
+          financingRectificationOrder.setPeasantHouseholdId((Long) params.get("peasantHouseholdId"));
+          financingRectificationOrderService.save(financingRectificationOrder);
         }