Merge remote-tracking branch 'origin/developer_bw' into developer_bw

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/HygfRectificationOrder.java

@@ -97,7 +97,12 @@ public class HygfRectificationOrder extends BaseEntity {
      */
     @TableField("rectification_source")
     private String rectificationSource;
-
+    
+    /**
+     * 整改来源
+     */
+    @TableField(exist = false)
+    private String rectificationSourceName;
 
     /**
      * 整改历史意见

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

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.hygf.biz.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.RectificationOrderEnum;
+import com.yeejoin.amos.boot.module.hygf.api.Enum.RectificationRoleEnum;
 import com.yeejoin.amos.boot.module.hygf.api.entity.HygfRectificationOrder;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -106,8 +107,11 @@ public class HygfRectificationOrderController extends BaseController {
 	@GetMapping(value = "/{sequenceNbr}")
 	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个审核单",  notes = "根据sequenceNbr查询单个审核单")
 	public ResponseModel<HygfRectificationOrder> selectOne(@PathVariable Long sequenceNbr) {
-
-	    return ResponseHelper.buildResponse(hygfRectificationOrderServiceImpl.getBaseMapper().selectById(sequenceNbr));
+		HygfRectificationOrder hygfRectificationOrder =	hygfRectificationOrderServiceImpl.getBaseMapper().selectById(sequenceNbr);
+		
+		RectificationRoleEnum enums = RectificationRoleEnum.getNodeByName(hygfRectificationOrder.getRectificationSource());
+		hygfRectificationOrder.setRectificationSourceName(enums!=null?enums.name():null);
+	    return ResponseHelper.buildResponse(hygfRectificationOrder);
 	}
 
 	/**

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

@@ -514,9 +514,6 @@ public class BasicGridAcceptanceServiceImpl
 					if (hygfRectificationOrder.getRectificationStatus().equals("待整改")){
 						up.set(BasicGridRecord::getGridStatus,GridStatusEnum.DZG.getCode());
 					}
-//					if (hygfRectificationOrder.getRectificationStatus().equals("待提交")){
-//						up.set(BasicGridRecord::getGridStatus,GridStatusEnum.ROLESDSH.getCode());
-//					}
 				}
 				this.wofkflowExcute(instanceId, approvalStatus , comment  );
 				break;
@@ -651,7 +648,7 @@ public class BasicGridAcceptanceServiceImpl
 			return	CommonResponseNewUtil.failureMessage("当前流程发生变化，暂时无法操作，请刷新再试");
 		}
 
-		String addorSubmit = hygfRectificationOrder.getAddorSubmit();;
+		String addorSubmit = hygfRectificationOrder.getAddorSubmit();
 		LambdaUpdateWrapper<BasicGridRecord> qu = new LambdaUpdateWrapper();
 		qu.eq(BasicGridRecord::getPeasantHouseholdId, hygfRectificationOrder.getPeasantHouseholeId());
 		if (!Objects.isNull(basicGridRecord) && null !=  basicGridRecord.getRectificationStatus() && !basicGridRecord.getRectificationStatus().contains(hygfRectificationOrder.getRectificationSource())){
@@ -664,6 +661,18 @@ public class BasicGridAcceptanceServiceImpl
 		//修改状态
 		if (addorSubmit.equals("0")){
 			qu.set(BasicGridRecord::getGridStatus,GridStatusEnum.DZG.getCode());
+			//如果历史有未完成的整改单则片区审核完成的时候改变主流程状态为整改单的状态
+			LambdaQueryWrapper<HygfRectificationOrder> query = new LambdaQueryWrapper<>();
+			query.eq(HygfRectificationOrder::getPeasantHouseholeId,basicGridRecord.getPeasantHouseholdId());
+			query.in(HygfRectificationOrder::getRectificationStatus,Arrays.asList("待整改","待提交","待审核"));
+			query.in(HygfRectificationOrder::getRectificationSource,Arrays.asList("bw-design","bw-engineering"));
+			List<HygfRectificationOrder> hygfRectificationOrders = rectificationOrderService.getBaseMapper().selectList(query);
+			for (HygfRectificationOrder hygfRectificationOrderO : hygfRectificationOrders) {
+				if (hygfRectificationOrderO.getRectificationStatus().equals("待审核")){
+					qu.set(BasicGridRecord::getGridStatus,GridStatusEnum.ZGDSH.getCode());
+					break;
+				}
+			}			
 			basicGridRecordService.update(null,qu);
 		}
 		rectificationOrderAuditingService.addRectification(hygfRectificationOrder);

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/resources/application-dev.properties

@@ -2,9 +2,9 @@ exception.debug=true
 ## DB properties:
 spring.datasource.dynamic.primary= mysql-service
 spring.datasource.mysql-service.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.mysql-service.jdbc-url=jdbc:mysql://47.92.234.253:3306/amos_project?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
+spring.datasource.mysql-service.jdbc-url=jdbc:mysql://47.92.234.253:13306/amos_project?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
 spring.datasource.mysql-service.username=root
-spring.datasource.mysql-service.password=Yeejoin@2020
+spring.datasource.mysql-service.password=Yeejoin_1234
 spring.datasource.mysql-service.type=com.zaxxer.hikari.HikariDataSource
 #最小连接
 spring.datasource.mysql-service.minimum-idle: 5