src/main/java/com/cool/bang/modules/mysql/domain/Progress.java

@@ -58,25 +58,29 @@ public class Progress {
 
     public Progress(){}
 
-    public Progress(Org org,ProjectAccount projectAccount, Gcjdsq gcjdsq){
-        this.businessNumber = gcjdsq.getId().toString();
+    public Progress(Org org, ProjectAccount projectAccount, Gcjdsq gcjdsq) {
+        this.businessNumber = "JD20230000" + String.format("%06d", gcjdsq.getId());
         this.orgId = org.getId();
         this.orgName = org.getOrgName();
-//        this.projectAccountId = projectAccount.getId();
-//        this.projectName = projectAccount.getProjectName();
+        if (projectAccount != null) {
+            this.projectAccountId = projectAccount.getId();
+            this.projectName = projectAccount.getProjectName();
+        }
+
         this.businessState = stateSwitch(gcjdsq.getShzt());
         this.delFlag = 1;
         this.createTime = gcjdsq.getSqsj();
         this.updateTime = gcjdsq.getShsj();
     }
 
+
     public Integer stateSwitch(Integer data){
         switch (data){
-            case 0:
-                return 1;
             case 1:
                 return 3;
-            case 2:
+            case 0:
+                return 1;
+            case -1:
                 return 4;
             default:
                 return 1;

src/main/java/com/cool/bang/modules/mysql/domain/ProgressDetail.java

@@ -67,11 +67,11 @@ public class ProgressDetail {
     public ProgressDetail(){}
 
     public ProgressDetail(BuildingAccount buildingAccount, ProgressConfig config, Gcjdsq gcjdsq){
-//        this.buildingAccountId = buildingAccount.getId();
-//        this.buildingAccountName = buildingAccount.getBuildingName();
-//        this.buildingNumber = buildingAccount.getBuildingId();
-//        this.buildingName = buildingAccount.getBuildingName();
-        //this.nowProgressName = config.getProgressName(); 取不到;
+        this.buildingAccountId = buildingAccount.getId();
+        this.buildingAccountName = buildingAccount.getBuildingName();
+        this.buildingNumber = buildingAccount.getBuildingId();
+        this.buildingName = buildingAccount.getBuildingName();
+        this.nowProgressName = config.getProgressName(); //取不到;
         this.progressId = config.getId();
         this.progressName = config.getProgressName();
         this.limitPercentage = config.getLimitPercentage();

src/main/java/com/cool/bang/modules/mysql/domain/SuperviseTo.java

@@ -122,6 +122,7 @@ public class SuperviseTo{
 
         this.director = jgztg.getLxr();
         this.phone = jgztg.getLxdh();
+        this.createTime = jgztg.getSqrq();
 
         this.appropriationAccountId = superviseAccount.getId();
         this.appropriationBank = superviseAccount.getBankName();

src/main/java/com/cool/bang/modules/mysql/service/MySQLService.java

@@ -662,7 +662,7 @@ public class MySQLService {
             ProjectAccount projectAccount = projectAccountMapper.selectByAregid(gcjdsq.getAregid());
 
             for (ProgressConfig progressConfig : progressConfigList) {
-                if (progressConfig.getLimitPercentage().compareTo(gcjdsq.getSqjd()) == 0) {
+                if (progressConfig.getLimitPercentage().compareTo(new BigDecimal("100").subtract(gcjdsq.getSqjd())) == 0) {
                     currProgressConfig = progressConfig;
                 }
             }
@@ -701,6 +701,7 @@ public class MySQLService {
                 record1.setApprovalTime(gcjdsq.getSqsj());
                 record1.setCreateTime(gcjdsq.getSqsj());
                 record1.setUpdateTime(gcjdsq.getSqsj());
+                record1.setDelFlag(1);
 
                 ApprovalRecord record2 = new ApprovalRecord();
                 record2.setBusinessNumber(progress.getBusinessNumber());
@@ -710,8 +711,10 @@ public class MySQLService {
                 record2.setNodeName(node2.getNodeName());
                 record2.setApprover("监管部门");
                 record2.setApprovalTime(gcjdsq.getShsj());
+                record2.setApprovalRemark(gcjdsq.getBz());
                 record2.setCreateTime(gcjdsq.getShsj());
                 record2.setUpdateTime(gcjdsq.getShsj());
+                record2.setDelFlag(1);
                 if (progress.getBusinessState() == 3) { //审核通过
                     record2.setApprovalStatus(1);
                 } else { //审核驳回

src/main/resources/mapper/oracle/ApplyMapper.xml

@@ -75,7 +75,7 @@
             aregitem t5 on t1.aregid = t5.aregid and t5.jiechuappid is null
         where t1.apptype = 4 and t1.state = 1 and t1.flowstate = 0
     </select>
-    
+
     <select id="selectByXmbhFromAreg" resultType="com.cool.bang.modules.oracle.domain.Areg">
         select jgstate from areg where xmbh = #{xmbh} group by jgstate
     </select>
@@ -112,7 +112,7 @@
     <select id="selectJgztg" resultMap="JgztgMap">
         select
             t1.appbh as ywbh,t3.accountno as jgzh,t4.qybh,t4.xmbh,t1.jbr as lxr,t1.lxdh,t2.payaccountno tgzh,t1.allmoney as xmzrje,
-            t2.payflag as bfzt,t2.payuse,t2.paycode,t1,
+            t2.payflag as bfzt,t2.payuse,t2.paycode, t1.sqsj as sqrq,
 
             t6.lzbh,t5.lzye,t5.lcbl,t5.lcje,t5.money as lzzrje,