并网优化

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/MyBatisPlusCodeGenerator.java

@@ -103,12 +103,12 @@ public class MyBatisPlusCodeGenerator {
         gc.setActiveRecord(false);
         // 数据源配置
         DataSourceConfig dsc = new DataSourceConfig();
-        dsc.setUrl("jdbc:mysql://47.92.234.253:3306/amos_project?serverTimezone=GMT%2B8");
+        dsc.setUrl("jdbc:mysql://47.92.234.253:13306/amos_project?serverTimezone=GMT%2B8");
         // dsc.setSchemaName("public");
 //        dsc.setDriverName("com.mysql.jdbc.Driver");
         dsc.setDriverName("com.mysql.cj.jdbc.Driver");
         dsc.setUsername("root");
-        dsc.setPassword("Yeejoin@2020");
+        dsc.setPassword("Yeejoin_1234");
 
         dsc.setTypeConvert(new ITypeConvert() {
             @Override
@@ -130,7 +130,7 @@ public class MyBatisPlusCodeGenerator {
         // 包配置
         final PackageConfig pc = new PackageConfig();
         // 填写对应模块
-        pc.setModuleName(projectShortName);
+        pc.setModuleName(projectShortName1);
         // 实体路径
         pc.setParent("com.yeejoin.amos.boot.module");
         pc.setEntity("api.entity");
@@ -294,7 +294,7 @@ public class MyBatisPlusCodeGenerator {
         strategy.setTablePrefix();
         //去除表名前缀
         strategy.setTablePrefix("tz_" + projectShortName1 + "_", "t_", "tb_", "sys_", "other_", "rpm_", "s_", "tcb_",
-                "cb_", "tz_", "jc_", "jcb_", "flc_");
+                "cb_", "tz_", "jc_", "jcb_", "flc_","hygf_");
         // 设置父级Controller
         strategy.setSuperControllerClass("com.yeejoin.amos.boot.biz.common.controller.BaseController");
         autoGenerator.setStrategy(strategy);

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

@@ -14,12 +14,16 @@ public enum GridStatusEnum {
 
 
     DDJ("待登记", "1"),
-
-    DSH("待审核", "2"),
-
+    JXSGLYDSH("经销商管理员待审核", "2"),
     YWC("已完成", "3"),
+    WTG("未通过", "4"),
+    ZGDSH("整改待审核", "5"),
+    PQYYDSH("片区运营待审核", "6"),
+    GCDSH("工程待审核", "7"),
+    SJDSH("设计待审核", "8"),
+    DZG("待整改", "9"),
+    ROLESDSH("设计待审核/工程待审核", "10");
 
-    WTG("未通过", "4");
 
     /**
      * 名称，描述

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

@@ -7,6 +7,7 @@ import com.yeejoin.amos.boot.module.hygf.api.dto.BasicGridAcceptanceDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.UserUnitInformationDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.AcceptanceCheckItem;
 import com.yeejoin.amos.boot.module.hygf.api.entity.HygfOnGrid;
+import com.yeejoin.amos.boot.module.hygf.api.entity.HygfRectificationOrder;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.BasicGridAcceptanceMapper;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.HygfOnGridMapper;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.PersonnelBusinessMapper;
@@ -23,6 +24,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 
 /**
  *
@@ -190,6 +192,67 @@ public class BasicGridAcceptanceController extends BaseController {
     }
 
 
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "POST",value = "完工自审管理审核",   notes = "完工自审管理审核")
+	@PostMapping(value = "/completeAudit")
+	public ResponseModel completeAudit( @RequestBody Map<String,String> kv) {
+		basicGridAcceptanceServiceImpl.completeAudit(kv);
+		return ResponseHelper.buildResponse(null);
+	}
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "整改单下发",   notes = "整改单下发")
+	@PostMapping(value = "/addRectification")
+	public ResponseModel addRectification( @RequestBody HygfRectificationOrder hygfReplenishment) {
+
+		basicGridAcceptanceServiceImpl.addRectification(hygfReplenishment);
+		return ResponseHelper.buildResponse(null);
+	}
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "POST",value = "整改单添加信息",   notes = "整改单添加信息")
+	@PostMapping(value = "/nextTaskExcute")
+	public ResponseModel nextTaskExcute( @RequestBody HygfRectificationOrder hygfReplenishment) {
+
+		basicGridAcceptanceServiceImpl.nextTaskExcute(hygfReplenishment);
+		return ResponseHelper.buildResponse(null);
+	}
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "POST",value = "整改单审核",   notes = "整改单审核")
+	@PostMapping(value = "/nextTaskAduit")
+	public ResponseModel nextTaskAduit( @RequestBody HygfRectificationOrder hygfReplenishment) {
+
+		basicGridAcceptanceServiceImpl.nextTaskAduit(hygfReplenishment);
+		return ResponseHelper.buildResponse(null);
+	}
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "PUT",value = "整改单作废",   notes = "整改单作废")
+	@PutMapping(value = "/rollback")
+	public ResponseModel rollback( @RequestParam(value = "sequenceNbr") Long sequenceNbr) {
+
+		basicGridAcceptanceServiceImpl.rollback(sequenceNbr);
+		return ResponseHelper.buildResponse(null);
+	}
+
+
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/test1")
+	@ApiOperation(httpMethod = "POST", value = "执行工作流", notes = "执行工作流")
+	public ResponseModel test() {
+		basicGridAcceptanceServiceImpl.testKAIQI();
+		return ResponseHelper.buildResponse(null);
+	}
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/test2")
+	@ApiOperation(httpMethod = "POST", value = "执行工作流", notes = "执行工作流")
+	public ResponseModel test(String approvalStatus,String comment) {
+		basicGridAcceptanceServiceImpl.zhixing(approvalStatus,comment);
+		return ResponseHelper.buildResponse(null);
+	}
 
 
 }