Merge branch 'master' of http://git.ningdatech.com/liushuai/project-management into dev

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ConstructionManage.java

@@ -119,6 +119,8 @@ public class ConstructionManage {
             item.setIsHigherSuperOrg(w.getIsHigherSuperOrg());
             item.setApprovedAmount(w.getApprovalAmount());
             item.setApprovalDate(w.getApprovalDate());
+            item.setTransactionAmount(w.getTransactionAmount());
+            item.setTransactionTime(w.getTransactionTime());
             return item;
         });
         return PageVo.of(records, total);

pmapi/src/test/java/com/ningdatech/pmapi/irs/IrsTest.java

@@ -50,7 +50,7 @@ public class IrsTest extends AppTests {
     public void test1() {
         String method = "GET";
         String url = "https://bcdsg.zj.gov.cn:8443/restapi/prod/IC33000020230427000001/irs-res-bill/report/pdfUrl" +
-                "?appCode=A331101453557202109017383";
+                "?appCode=A331123467587202210014168";
         String appScret = "BCDSGS_4ab4235d26a9a357170a39f3a13fd68c";
         String appKey = "BCDSGA_d874c8e46b541eb4e8aac6510fd3351b";
 
@@ -76,7 +76,7 @@ public class IrsTest extends AppTests {
         String areaCode = "331123";
         String appScret = "496f0f2a19994f76b4fd9dae087366c7";
         String appKey = "A331101453557202109017383";
-        String appCode = "A331123467587202307014170";//A331123467587202307014171
+        String appCode = "A331123467587202307014177";//A331123467587202307014171
 
         String requestSecret = RefreshKeyUtil.getRequestSecret(appKey, appScret);
         String sign = CryptUtils.MD5Encode(appKey + requestSecret + timestamp);

pmapi/src/test/java/com/ningdatech/pmapi/irs/irsTest3.java

@@ -74,7 +74,7 @@ public class irsTest3 extends AppTests {
         }else{
             restTemplate = new RestTemplate();
         }
-        String appId = "A330000100000202105005790";
+        String appId = "A331123467587202307014177";
         String updateTime = "2023-07-26 00:00:00";
         String capCode = timestamp + updateTime + appId;
         String url = "https://interface.zjzwfw.gov.cn/gateway/api/proxy/001003001029/" +