整改单状态修改

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

@@ -88,6 +88,10 @@ public class FinancingRectificationOrderController extends BaseController {
 	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个投融整改单",  notes = "根据sequenceNbr查询单个投融整改单")
 	public ResponseModel<FinancingRectificationOrderDto> selectOne(@PathVariable Long sequenceNbr) {
 		FinancingRectificationOrderDto dto = financingRectificationOrderServiceImpl.queryBySeq(sequenceNbr);
+		//前端回显有问题 兼容前端此处返回做特殊处理
+		if ("待整改".equals(dto.getRectificationStatus())){
+			dto.setRectificationStatus("整改未完成");
+		}
 		if (!StringUtils.isEmpty(dto.getRectificationPhoto())){
 			dto.setRectificationPhotos(JSONArray.parseArray(dto.getRectificationPhoto()));
 		}

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

@@ -211,7 +211,9 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto,Finan
         if (params.containsKey("isFlag")) {
             task.setResultCode("isFlag");
             map.put("isFlag", params.get("isFlag"));
-            params.put("comments","退回整改");
+            if(params.get("isFlag").equals("1")){
+                params.put("comments","退回整改");
+            }
         } else {
             task.setResultCode("approvalStatus");
             map.put("approvalStatus", params.get("approvalStatus"));
@@ -264,9 +266,10 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto,Finan
                     BeanUtils.copyProperties(oldData, financingRectificationOrder);
                     financingRectificationOrder.setSequenceNbr(null);
                     financingRectificationOrder.setCompleteDate(null);
+                    financingRectificationOrder.setRectificationPhoto(null);
                 }
                 financingRectificationOrder.setRectificationOrderCode(String.valueOf(new Date().getTime()));
-                financingRectificationOrder.setRectificationStatus("整改未完成");
+                financingRectificationOrder.setRectificationStatus("待整改");
                 financingRectificationOrder.setProblemDescription(params.getOrDefault("problemDescription", "").toString());
                 financingRectificationOrder.setPeasantHouseholdName(params.getOrDefault("peasantHouseholdName", "").toString());
                 financingRectificationOrder.setRectificationDescription(params.getOrDefault("rectificationDescription", "").toString());