租赁资产档案定时问题修复，NC部门成本sql修改

mjava-lanyun/src/main/java/com/malk/lanyun/service/impl/NCServiceImpl.java

@@ -268,49 +268,53 @@ public class NCServiceImpl implements NCService {
             statement = connection.createStatement();
 
             // 测试sql 执行查询
-            String sql = "select \n" +
-                    "  org_accountingbook.code orgcode,\n" +
-                    "  org_accountingbook.name orgname,\n" +
-                    "  bd_account.code kmcode,\n" +
-                    "  substring(bd_account.code,0,5) kmbm,\n" +
-                    "  bd_accasoa.name kmname,\n" +
-                    "  bd_accasoa.dispname KMMC,\n" +
-                    " org_dept.code bmcode,\n" +
-                    " org_dept.name bmname,\n" +
-                    " bd_project.project_code xmcode,\n" +
-                    " bd_project.project_name xmname,\n" +
-                    " SUM(gl_detail.localdebitamount) JFFS\n" +
-                    "  from gl_detail gl_detail\n" +
-                    "  left join gl_docfree1 on gl_detail.assid = gl_docfree1.assid\n" +
-                    "  left join org_dept on gl_docfree1.f1 = org_dept.pk_dept\n" +
-                    "  left join bd_project on gl_docfree1.f10=bd_project.pk_project\n" +
-                    "  left join org_accountingbook on gl_detail.pk_accountingbook=org_accountingbook.pk_accountingbook\n" +
-                    "  left join bd_accasoa on gl_detail.pk_accasoa=bd_accasoa.pk_accasoa\n" +
-                    "  left join bd_account on bd_accasoa.pk_account=bd_account.pk_account\n" +
-                    "  \n" +
-                    " where  substring(bd_account.code,0,5) in ('5001','5301','6602','6601','6001','6051')\n" +
-                    "   and gl_detail.yearv = '"+ year +"'\n" +
-                    "   and gl_detail.adjustperiod = '" + month + "'\n" +
-                    "   and org_accountingbook.code in('A01-0004','A02-0004','A11-0004','A03-0004','A06-0004','A04-0004','A05-0004','A10-0004')\n" +
-                    "   and gl_detail.discardflagv <> 'Y'\n" +
-                    "   and gl_detail.dr = 0\n" +
-                    "   and gl_detail.voucherkindv <> 255\n" +
-                    "   and gl_detail.tempsaveflag <> 'Y'\n" +
-                    "   and gl_detail.voucherkindv <> 5\n" +
-                    "   and (gl_docfree1.F1 <> 'NN/A' or gl_docfree1.F10 <> 'NN/A' )\n" +
-                    "   and 1 = 1\n" +
-                    " group by gl_detail.pk_accasoa,\n" +
-                    "          gl_detail.pk_accountingbook,\n" +
-                    "          gl_detail.yearv,\n" +
-                    "          org_dept.code ,\n" +
-                    "          org_dept.name ,\n" +
-                    "          org_accountingbook.code,\n" +
-                    "          org_accountingbook.name,\n" +
-                    "          bd_accasoa.dispname,\n" +
-                    "  bd_account.code,\n" +
-                    "  bd_accasoa.name,\n" +
-                    "  bd_project.project_code,\n" +
-                    "  bd_project.project_name";
+            String sql = "SELECT\n" +
+                    "\torg_accountingbook.CODE orgcode,\n" +
+                    "\torg_accountingbook.NAME orgname,\n" +
+                    "\tbd_account.CODE kmcode,\n" +
+                    "\tsubstring( bd_account.CODE, 0, 5 ) kmbm,\n" +
+                    "\tbd_accasoa.NAME kmname,\n" +
+                    "\tbd_accasoa.dispname KMMC,\n" +
+                    "\tISNULL(org_dept.CODE,bd_project.project_code) ccode,\n" +
+                    "\tISNULL(org_dept.NAME,bd_project.project_name) cname,\n" +
+                    "\torg_dept.CODE bmcode,\n" +
+                    "\torg_dept.NAME bmname,\n" +
+                    "\tbd_project.project_code xmcode,\n" +
+                    "\tbd_project.project_name xmname,\n" +
+                    "\tSUM( gl_detail.localdebitamount ) JFFS \n" +
+                    "FROM\n" +
+                    "\tgl_detail gl_detail\n" +
+                    "\tLEFT JOIN gl_docfree1 ON gl_detail.assid = gl_docfree1.assid\n" +
+                    "\tLEFT JOIN org_dept ON gl_docfree1.f1 = org_dept.pk_dept\n" +
+                    "\tLEFT JOIN bd_project ON gl_docfree1.f10 = bd_project.pk_project\n" +
+                    "\tLEFT JOIN org_accountingbook ON gl_detail.pk_accountingbook = org_accountingbook.pk_accountingbook\n" +
+                    "\tLEFT JOIN bd_accasoa ON gl_detail.pk_accasoa = bd_accasoa.pk_accasoa\n" +
+                    "\tLEFT JOIN bd_account ON bd_accasoa.pk_account = bd_account.pk_account \n" +
+                    "WHERE\n" +
+                    "\tsubstring( bd_account.CODE, 0, 5 ) IN ( '5001', '5301', '6602', '6601', '6001', '6051' ) \n" +
+                    "\tAND gl_detail.yearv = '2025' \n" +
+                    "\tAND gl_detail.adjustperiod = '04' \n" +
+                    "\tAND org_accountingbook.CODE IN ( 'A01-0004', 'A02-0004', 'A11-0004', 'A03-0004', 'A06-0004', 'A04-0004', 'A05-0004', 'A10-0004' ) \n" +
+                    "\tAND gl_detail.discardflagv <> 'Y' \n" +
+                    "\tAND gl_detail.dr = 0 \n" +
+                    "\tAND gl_detail.voucherkindv <> 255 \n" +
+                    "\tAND gl_detail.tempsaveflag <> 'Y' \n" +
+                    "\tAND gl_detail.voucherkindv <> 5 \n" +
+                    "\tAND ( gl_docfree1.F1 <> 'NN/A' OR gl_docfree1.F10 <> 'NN/A' ) \n" +
+                    "\tAND 1 = 1 \n" +
+                    "GROUP BY\n" +
+                    "\tgl_detail.pk_accasoa,\n" +
+                    "\tgl_detail.pk_accountingbook,\n" +
+                    "\tgl_detail.yearv,\n" +
+                    "\torg_dept.CODE,\n" +
+                    "\torg_dept.NAME,\n" +
+                    "\torg_accountingbook.CODE,\n" +
+                    "\torg_accountingbook.NAME,\n" +
+                    "\tbd_accasoa.dispname,\n" +
+                    "\tbd_account.CODE,\n" +
+                    "\tbd_accasoa.NAME,\n" +
+                    "\tbd_project.project_code,\n" +
+                    "\tbd_project.project_name";
 
 
             resultSet = statement.executeQuery(sql);
@@ -323,7 +327,8 @@ public class NCServiceImpl implements NCService {
                 hashMap.put("textField_m0dkzhwo", yearAndNonth);
                 hashMap.put("textField_m0dkzhwu",resultSet.getString("kmcode"));
                 hashMap.put("textField_m0dkzhwv",resultSet.getString("kmname"));
-                hashMap.put("textField_m0eudqp0",resultSet.getString("bmname"));//部门
+                hashMap.put("textField_mbj1j8n2",resultSet.getString("ccode"));
+                hashMap.put("textField_m0eudqp0",resultSet.getString("cname"));//部门
                 hashMap.put("numberField_m0dkzhx1",resultSet.getBigDecimal("JFFS"));
 
                 ydClient.operateData(YDParam.builder()

mjava-lanyun/src/main/java/com/malk/lanyun/service/impl/SyncAssetsImpl.java

@@ -112,7 +112,7 @@ public class SyncAssetsImpl implements SyncAssetsService {
                 .searchFieldJson(JSON.toJSONString(UtilMap.map("selectField_lty0oyvd","正常")))
                 .build();
         //pagesize设为1获取总数
-        ydParam.setPageSize(1);
+//        ydParam.setPageSize(1);
         dataList = ydService.queryFormData_all(ydParam);
         if (ObjectUtil.isNotNull(dataList)&&dataList.size()>0){
             dataList.forEach(e->{

mjava/src/main/java/com/malk/server/aliwork/YDConf.java

@@ -63,6 +63,7 @@ public class YDConf {
         retrieve_details,             // 子表数据[表单]
         retrieve_changed,    // 变更记录
         retrieve_definition, // 表单定义
+        retrieve_approval_record,
 
     }
 
@@ -81,6 +82,7 @@ public class YDConf {
         start,                      // 发起流程
         batchSave,                  // 批量创建
         terminate,                  // 终止流程
+        remarks;
     }
 
     /**

mjava/src/main/java/com/malk/server/aliwork/YDParam.java

@@ -74,6 +74,8 @@ public class YDParam extends BaseDto {
 
     @NotNull(message = "实例ID不能为空", groups = Retrieve_ProcessInstanceIds.class)
     private String processInstanceIds;
+    private String atUserId;
+    private String content;
 
     private String instanceStatus;
 

mjava/src/main/java/com/malk/service/aliwork/impl/YDClientImpl.java

@@ -90,6 +90,9 @@ public class YDClientImpl implements YDClient {
             case terminate:
                 ddr_new = (DDR_New) UtilHttp.doPut(getRequestUrl("/processes/instances/terminate"), ddClient.initTokenHeader(), bodys, DDR_New.class);
                 break;
+            case remarks:
+                ddr_new = (DDR_New)UtilHttp.doPost(this.getRequestUrl("/forms/remarks"), this.ddClient.initTokenHeader(), (Map)null, this._initBodyParam(ydParam), DDR_New.class);
+                break;
             default:
                 break;
         }
@@ -137,6 +140,9 @@ public class YDClientImpl implements YDClient {
             case retrieve_changed:
                 ddr_new = DDR_New.doPost(getRequestUrl("/forms/operationsLogs/query"), ddClient.initTokenHeader(), null, param);
                 break;
+            case retrieve_approval_record:
+                ddr_new = DDR_New.doGet(this.getRequestUrl("/processes/operationRecords"), this.ddClient.initTokenHeader(), param);
+                break;
         }
         return ddr_new;
     }