javascript/xuanran.wang/bme/js/Common.js

@@ -57,7 +57,7 @@ function submitCallback(detailTable, detail2PayProportionId){
             let rowIndex = rowArr[i];
             if(rowIndex !== ""){
                 let field = `${detail2PayProportionId}_${rowIndex}`;
-                sum = addFloat(sum, parseFloat(WfForm.getFieldValue(field)));//遍历明细行字段
+                sum += parseFloat(WfForm.getFieldValue(field));//遍历明细行字段
             }
         }
         console.log('sum => ', sum)
@@ -65,11 +65,6 @@ function submitCallback(detailTable, detail2PayProportionId){
     });
 }
 
-function addFloat(a, b) {
-    let precision = Math.pow(10, 10); // 设置精度，根据需要调整
-    return (Math.round(a * precision) + Math.round(b * precision)) / precision;
-}
-
 /**
  * 明细表字段发生变化进行日期计算
  * @param bindField

javascript/xuanran.wang/longgong/NewProductTest.js

@@ -1,27 +1,27 @@
 // 首台销售日期
-var firstSaleDateField = WfForm.convertFieldNameToId("stxsrq");
+const firstSaleDateField = WfForm.convertFieldNameToId("stxsrq");
 // 跟踪时间
-var trackTimeField = WfForm.convertFieldNameToId("gzsj");
+const trackTimeField = WfForm.convertFieldNameToId("gzsj");
 // 跟踪时间为三个月以内
-var threeMonthIndex = 1;
+const threeMonthIndex = 1;
 // 是否提交等待节点
-var submitWaitNode = WfForm.convertFieldNameToId("sftjddjd");
+const submitWaitNode = WfForm.convertFieldNameToId("sftjddjd");
 // 下次超时提醒日期
-var timeoutRemindDateFiled = WfForm.convertFieldNameToId("cstxrq");
+const timeoutRemindDateFiled = WfForm.convertFieldNameToId("cstxrq");
 // 跟踪天数 <= 1 ? 15 : 30;
-var trackingDaysField = WfForm.convertFieldNameToId("gzts")
+const trackingDaysField = WfForm.convertFieldNameToId("gzts")
 // 跟踪触发行数
-var trackingLineField = WfForm.convertFieldNameToId("gzcfxs");
+const trackingLineField = WfForm.convertFieldNameToId("gzcfxs");
-jQuery(document).ready(function (){
+$(() => {
-    var detail2LineNum = WfForm.getDetailRowCount("detail_2");
+    let detail2LineNum = WfForm.getDetailRowCount("detail_2");
     // let firstTrack = Boolean(true);
     // if (new Date(firstSaleDate) < new Date(currentDate) && dayDiff > 0) {
     //     firstTrack = false;
     // }
     // console.log('firstTrack ', firstTrack)
     // 到达节点次数
-    var nodeNum = getNodeNum();
+    const nodeNum = getNodeNum();
-    var trackingLine = parseInt(WfForm.getFieldValue(trackingLineField));
+    let trackingLine = parseInt(WfForm.getFieldValue(trackingLineField));
     // 如果不是则自动添加一行明细让他自己填写
     if (detail2LineNum < trackingLine && detail2LineNum < nodeNum) {
         console.log('添加一行明细!');
@@ -33,32 +33,32 @@ jQuery(document).ready(function (){
         return;
     }
     initTimeoutDate();
-    WfForm.bindFieldChangeEvent(firstSaleDateField + "," + trackTimeField,function (){
+    WfForm.bindFieldChangeEvent(`${firstSaleDateField},${trackTimeField}`,()=>{
         initTimeoutDate();
     });
 });
 
 function getNodeNum(){
-    var firstSaleDate = WfForm.getFieldValue(firstSaleDateField);
+    let firstSaleDate = WfForm.getFieldValue(firstSaleDateField);
     console.log('首台销售日期 ', firstSaleDate);
-    var currentDate = getCurrentDate();
+    let currentDate = getCurrentDate();
-    var dayDiff = getDaysDiff(firstSaleDate, currentDate);
+    let dayDiff = getDaysDiff(firstSaleDate, currentDate);
     console.log('当前天数与首台销售日期相差天数 :  ', dayDiff)
-    var trackingDays = WfForm.getFieldValue(trackingDaysField);
+    let trackingDays = WfForm.getFieldValue(trackingDaysField);
     return Math.floor(dayDiff / trackingDays) + 1;
 }
 
 function initTimeoutDate(){
     console.log('==== initTimeoutDate begin ====')
-    var firstSaleDate = WfForm.getFieldValue(firstSaleDateField);
+    let firstSaleDate = WfForm.getFieldValue(firstSaleDateField);
-    var nodeNum = getNodeNum();
+    const nodeNum = getNodeNum();
     console.log('到达节点次数 ', nodeNum);
-    var trackingDays = WfForm.getFieldValue(trackingDaysField);
+    let trackingDays = WfForm.getFieldValue(trackingDaysField);
     console.log('跟踪天数 ', trackingDays);
-    var computeTimeoutDate = addDays(firstSaleDate, nodeNum * trackingDays);
+    let computeTimeoutDate = addDays(firstSaleDate, nodeNum * trackingDays);
     console.log('计算下次超时日期 ', computeTimeoutDate);
-    var trackingLine = parseInt(WfForm.getFieldValue(trackingLineField));
+    let trackingLine = parseInt(WfForm.getFieldValue(trackingLineField));
-    var detail2LineNum = WfForm.getDetailRowCount("detail_2");
+    let detail2LineNum = WfForm.getDetailRowCount("detail_2");
     setTimeout(()=>{
         WfForm.changeFieldValue(timeoutRemindDateFiled, {value: computeTimeoutDate});
         // 判断流程提交走向
@@ -72,7 +72,7 @@ function initTimeoutDate(){
                 if (detail2LineNum < trackingLine) {
                     WfForm.showMessage('请填写明细表信息!');
                     detail2LineNum = WfForm.getDetailRowCount("detail_2");
-                    for (var i = 0; i < trackingLine - parseInt(detail2LineNum); i++) {
+                    for (let i = 0; i < trackingLine - parseInt(detail2LineNum); i++) {
                         WfForm.addDetailRow("detail_2", {});
                     }
                     return;
@@ -89,8 +89,8 @@ function initTimeoutDate(){
 function getDaysDiff(date1, date2) {
     date1 = new Date(date1);
     date2 = new Date(date2);
-    var oneDay = 24 * 60 * 60 * 1000; // 一天的毫秒数
+    const oneDay = 24 * 60 * 60 * 1000; // 一天的毫秒数
-    var timeDiff = Math.abs(date1.getTime() - date2.getTime()); // 两个日期对象的毫秒数差值
+    const timeDiff = Math.abs(date1.getTime() - date2.getTime()); // 两个日期对象的毫秒数差值
      // 将毫秒数差值转换为天数差值并四舍五入
     return Math.round(timeDiff / oneDay);
 }
@@ -100,14 +100,14 @@ function getCurrentDate() {
 }
 
 function parseDate(date) {
-    var currentYear = date.getFullYear();
+    const currentYear = date.getFullYear();
-    var currentMonth = date.getMonth() + 1; // getMonth()返回0~11，需要加1
+    const currentMonth = date.getMonth() + 1; // getMonth()返回0~11，需要加1
-    var currentDay = date.getDate();
+    const currentDay = date.getDate();
     return currentYear + '-' + currentMonth + '-' + currentDay;
 }
 
 function addDays(date, days) {
-    var newDate = new Date(date);
+    const newDate = new Date(date);
     newDate.setDate(newDate.getDate() + days);
     console.log('newDate ', newDate)
     return parseDate(newDate);

src/main/java/com/api/xuanran/wang/sh_bigdata/sso/service/impl/OtherSystemToOAServiceImpl.java

@@ -69,7 +69,7 @@ public class OtherSystemToOAServiceImpl implements OtherSystemToOAService {
         String sql = "select id from hrmresource where " + Util.null2DefaultStr(ShBigDataUtil.getPropertiesValByKey("ssoOaCompareField"),"outkey")  + " = #{outKey}";
         int id = otherSystemToOAMapper.selectUserIdByOutKey(sql, oaOutKey);
         if(id < 0){
-            throw new CustomerException(Util.logStr("code : {} not found in OA!", oaOutKey));
+            throw new CustomerException(Util.logStr("code : {} not found in OA!", id));
         }
         return id;
     }

src/main/java/weaver/xuanran/wang/immc/cusfieldvalue/CusListValue.java

@@ -2,10 +2,8 @@ package weaver.xuanran.wang.immc.cusfieldvalue;
 
 import aiyh.utils.Util;
 import com.alibaba.fastjson.JSONObject;
-import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
-import weaver.general.TimeUtil;
 import weaver.xiao.commons.config.interfacies.CusInterfaceGetValue;
 import weaver.xiao.commons.config.interfacies.CusInterfaceListValue;
 import weaver.xuanran.wang.immc.mapper.ImMcMapper;
@@ -29,31 +27,24 @@ public class CusListValue implements CusInterfaceGetValue {
         log.info("pathParam : \n" + JSONObject.toJSONString(pathParam));
         String attachmentField = Util.null2DefaultStr(pathParam.get("attachmentField"), "");
         String cusSql = Util.null2DefaultStr(pathParam.get("cusSql"), "");
-        // 如果fileName不为空则对集合中每个map添加"fileName":value value则是附件字段名称
-        String fileName = Util.null2DefaultStr(pathParam.get("fileName"), "");
         if(StringUtils.isNotBlank(cusSql)){
+            String docIds = "";
             if (StringUtils.isNotBlank(attachmentField)) {
+                List<String> attachment = new ArrayList<>();
                 for (String item : attachmentField.split(",")) {
                     String filedValue = Util.null2DefaultStr(mainMap.get(item),"");
-                    if(StringUtils.isNotBlank(Util.null2DefaultStr(mainMap.get(filedValue),""))){
+                    if(StringUtils.isNotBlank(Util.null2DefaultStr(mainMap.get(item),""))){
+                        attachment.add(filedValue);
+                    }
+                }
+                docIds = StringUtils.join(attachment, ",");
+            }
             cusSql = cusSql
-                                .replace("{?docIds}", "( " + filedValue + " )")
+                    .replace("{?docIds}", "( " + docIds + " )")
                     .replace("{?requestid}",Util.null2DefaultStr(mainMap.get("requestid"),""));
             List<Map<String, String>> attachmentInfo = mapper.getAttachmentInfo(cusSql);
-                        if(CollectionUtils.isEmpty(attachmentInfo)){
-                            continue;
-                        }
-                        // 往map中put附件字段名
-                        if(StringUtils.isBlank(fileName)){
-                            attachmentInfo.forEach(file ->{
-                                file.put(fileName, item);
-                            });
-                        }
             list.addAll(attachmentInfo);
         }
-                }
-            }
-        }
         return list;
     }
 }

src/main/java/weaver/xuanran/wang/immc/service/WorkFlowToVmsAndMQService.java

@@ -42,7 +42,6 @@ public class WorkFlowToVmsAndMQService {
     // 表单字段
     private static final String VMS_SUCCESS = "vms_success";
     private static final String SUCCESS = "0";
-
     {
         httpUtils.getGlobalCache().header.put("Content-Type", MediaType.APPLICATION_JSON);   // 全局请求头
     }
@@ -89,12 +88,11 @@ public class WorkFlowToVmsAndMQService {
 
     /**
      * <h1>解析响应对象</h1>
-     *
+     * @author xuanran.wang
+     * @dateTime 2022/12/23 11:25
      * @param responseVo 响应对象
      * @param url 地址
      * @param requestParam 请求
-     * @author xuanran.wang
-     * @dateTime 2022/12/23 11:25
      **/
     private void parseResponseVo(ResponeVo responseVo, String url, Map<String, Object> requestParam, VmsResponseVoField vmsResponseVoField){
         if (responseVo.getCode() != SUCCESS_CODE) {   // 相应状态码
@@ -114,11 +112,10 @@ public class WorkFlowToVmsAndMQService {
 
     /**
      * <h1>将流程信息发送到kafka</h1>
-     *
-     * @param kafkaConfig kafka配置文件名称
-     * @param message     消息对象
      * @author xuanran.wang
      * @dateTime 2023/3/30 14:56
+     * @param kafkaConfig kafka配置文件名称
+     * @param message 消息对象
      **/
     public void sendToMQ(String kafkaConfig, Map<String, Object> message){
         KafkaProducer<String, String> producer = null;
@@ -162,12 +159,11 @@ public class WorkFlowToVmsAndMQService {
 
     /**
      * <h1>更新流程sql</h1>
-     *
+     * @author xuanran.wang
+     * @dateTime 2023/3/30 19:18
      * @param field 主表字段
      * @param tableName 表名
      * @param requestId 请求id
-     * @author xuanran.wang
-     * @dateTime 2023/3/30 19:18
      **/
     public void updateWorkFlow(String field, String tableName, String requestId){
         String updateSQL = "update " + tableName + " set " + field + " = " + SUCCESS + " where requestid = ?";

src/main/java/weaver/xuanran/wang/sh_bigdata/common/util/SendTodoTaskUtil.java

@@ -74,11 +74,6 @@ public class SendTodoTaskUtil {
             todoTask.setAgentid(agentId);
             todoTask.setTaskName(obj.getRequestnamenew());
             todoTask.setTaskDesc(obj.getRequestnamenew());
-            String pcAgentId = ShBigDataUtil.getPropertiesValByKey("pcAgentId");
-            if(StringUtils.isBlank(pcAgentId)){
-                pcAgentId = agentId;
-            }
-            todoTask.setPcAgentId(pcAgentId);
             String todoSSOCallBackUrl = ShBigDataUtil.getPropertiesValByKey("todoSSOCallBackUrl");
             StringBuilder sb = new StringBuilder(todoSSOCallBackUrl);
             sb.append("?user=")

src/main/java/weaver/xuanran/wang/sh_bigdata/common/util/ShBigDataUtil.java

@@ -37,7 +37,6 @@ public class ShBigDataUtil {
         WHILTE_LIST.add("getUserIdDebugOutKey");
         WHILTE_LIST.add("ssoInterfaceCompareField");
         WHILTE_LIST.add("ssoOaCompareField");
-        WHILTE_LIST.add("pcAgentId");
     }
 
     /**

src/main/java/weaver/xuanran/wang/sh_bigdata/task_async/entity/CusTodoTask.java

@@ -26,5 +26,4 @@ public class CusTodoTask {
     protected String mobileLinkUrl;
     protected String receiver;
     protected String sender;
-    protected String pcAgentId;
 }

src/test/java/xuanran/wang/big_data/BigDataTest.java

@@ -391,8 +391,8 @@ public class BigDataTest extends BaseTest {
 
     @Test
     public void testG(){
-        String oaOutKey = "wld";
+        String oaOutKey = "111";
-        String sql = "select id from hrmresource where loginid = #{outKey}";
+        String sql = "select id from hrmresource where " + Util.null2DefaultStr(ShBigDataUtil.getPropertiesValByKey("ssoOaCompareField"),"outkey")  + " = #{outKey}";
         int id = otherSystemToOAMapper.selectUserIdByOutKey(sql, oaOutKey);
         log.info("id => " + id);
     }