柏美问题修复

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

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

@@ -2,8 +2,10 @@ 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;
@@ -27,23 +29,30 @@ 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(item),""))){
+                    if(StringUtils.isNotBlank(Util.null2DefaultStr(mainMap.get(filedValue),""))){
-                        attachment.add(filedValue);
+                        cusSql = cusSql
+                                .replace("{?docIds}", "( " + filedValue + " )")
+                                .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);
                     }
                 }
-                docIds = StringUtils.join(attachment, ",");
             }
-            cusSql = cusSql
-                    .replace("{?docIds}", "( " + docIds + " )")
-                    .replace("{?requestid}",Util.null2DefaultStr(mainMap.get("requestid"),""));
-            List<Map<String, String>> attachmentInfo = mapper.getAttachmentInfo(cusSql);
-            list.addAll(attachmentInfo);
         }
         return list;
     }

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

@@ -42,6 +42,7 @@ 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);   // 全局请求头
     }
@@ -50,11 +51,11 @@ public class WorkFlowToVmsAndMQService {
     /**
      * <h1>推送数据</h1>
      *
-     * @param onlyMark  唯一编码
+     * @param onlyMark           唯一编码
-     * @param billTable 表名
+     * @param billTable          表名
-     * @param requestId 请求id
+     * @param requestId          请求id
      * @param vmsResponseVoField vms成功标识
-     * @param config kafka配置文件名称
+     * @param config             kafka配置文件名称
      * @author xuanran.wang
      * @dateTime 2022/12/5 17:05
      **/
@@ -68,9 +69,9 @@ public class WorkFlowToVmsAndMQService {
         String url = requestMappingConfig.getRequestUrl();
         dealWithMapping.setMainTable(billTable);
         Map<String, Object> param = dealWithMapping.getRequestParam(recordSet, requestMappingConfig);
-        String vmsSuccess = Util.null2DefaultStr(recordSet.getString(VMS_SUCCESS),"");
+        String vmsSuccess = Util.null2DefaultStr(recordSet.getString(VMS_SUCCESS), "");
-        String mqSuccess = Util.null2DefaultStr(recordSet.getString(MQ_SUCCESS),"");
+        String mqSuccess = Util.null2DefaultStr(recordSet.getString(MQ_SUCCESS), "");
-        if(!SUCCESS.equals(vmsSuccess)){
+        if (!SUCCESS.equals(vmsSuccess)) {
             ResponeVo responeVo;
             try {
                 responeVo = httpUtils.apiPost(url, param);
@@ -80,7 +81,7 @@ public class WorkFlowToVmsAndMQService {
             parseResponseVo(responeVo, url, param, vmsResponseVoField);
             updateWorkFlow(VMS_SUCCESS, billTable, requestId);
         }
-        if(!SUCCESS.equals(mqSuccess) && StringUtils.isNotBlank(config)){
+        if (!SUCCESS.equals(mqSuccess) && StringUtils.isNotBlank(config)) {
             sendToMQ(config, param);
             updateWorkFlow(MQ_SUCCESS, billTable, requestId);
         }
@@ -88,13 +89,14 @@ public class WorkFlowToVmsAndMQService {
 
     /**
      * <h1>解析响应对象</h1>
+     *
+     * @param responseVo   响应对象
+     * @param url          地址
+     * @param requestParam 请求
      * @author xuanran.wang
      * @dateTime 2022/12/23 11:25
-     * @param responseVo 响应对象
-     * @param url 地址
-     * @param requestParam 请求
      **/
-    private void parseResponseVo(ResponeVo responseVo, String url, Map<String, Object> requestParam, VmsResponseVoField vmsResponseVoField){
+    private void parseResponseVo(ResponeVo responseVo, String url, Map<String, Object> requestParam, VmsResponseVoField vmsResponseVoField) {
         if (responseVo.getCode() != SUCCESS_CODE) {   // 相应状态码
             log.error(Util.logStr("can not fetch [{}]，this request params is [{}]，" +   // 构建日志字符串
                             "this request heard is [{}]，but response status code is [{}]，" +
@@ -112,63 +114,65 @@ 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){
+    public void sendToMQ(String kafkaConfig, Map<String, Object> message) {
         KafkaProducer<String, String> producer = null;
         InputStream inputStream = null;
-       try {
+        try {
-           String path = GCONST.getPropertyPath() + "prop2map" + File.separator + kafkaConfig + ".properties";
+            String path = GCONST.getPropertyPath() + "prop2map" + File.separator + kafkaConfig + ".properties";
-           File configFile = new File(path);
+            File configFile = new File(path);
-           if(!configFile.exists()){
+            if (!configFile.exists()) {
-               throw new CustomerException("please check /web-inf/prop2map has " + kafkaConfig + ".properties");
+                throw new CustomerException("please check /web-inf/prop2map has " + kafkaConfig + ".properties");
-           }
+            }
-           Properties prop = new Properties();
+            Properties prop = new Properties();
-           inputStream= new BufferedInputStream(Files.newInputStream(configFile.toPath()));
+            inputStream = new BufferedInputStream(Files.newInputStream(configFile.toPath()));
-           prop.load(inputStream);
+            prop.load(inputStream);
-           log.info("prop => " + JSONObject.toJSONString(prop));
+            log.info("prop => " + JSONObject.toJSONString(prop));
-           log.info("msg => " + JSONObject.toJSONString(message));
+            log.info("msg => " + JSONObject.toJSONString(message));
-           String topic = Util.null2DefaultStr(prop.getProperty("topic"),"");
+            String topic = Util.null2DefaultStr(prop.getProperty("topic"), "");
-           if(StringUtils.isBlank(topic)){
+            if (StringUtils.isBlank(topic)) {
-               throw new CustomerException("kafka properties topic can not null!");
+                throw new CustomerException("kafka properties topic can not null!");
-           }
+            }
-           producer  = new KafkaProducer<>(prop);
+            producer = new KafkaProducer<>(prop);
-           // 发送消息到指定主题
+            // 发送消息到指定主题
-           ProducerRecord<String, String> record = new ProducerRecord<>(topic, JSONObject.toJSONString(message));
+            ProducerRecord<String, String> record = new ProducerRecord<>(topic, JSONObject.toJSONString(message));
-           producer.send(record).get();
+            producer.send(record).get();
-       }catch (Exception e){
+        } catch (Exception e) {
-           log.error(Util.getErrString(e));
+            log.error(Util.getErrString(e));
-           throw new CustomerException(Util.logStr("send to kafka error!: [{}]", e.getMessage()));
+            throw new CustomerException(Util.logStr("send to kafka error!: [{}]", e.getMessage()));
-       }finally {
+        } finally {
-           // 关闭Kafka生产者实例
+            // 关闭Kafka生产者实例
-           if(producer != null){
+            if (producer != null) {
-               producer.close();
+                producer.close();
-           }
+            }
-           if(inputStream != null){
+            if (inputStream != null) {
-               try {
+                try {
-                   inputStream.close();
+                    inputStream.close();
-               }catch (Exception e){
+                } catch (Exception e) {
-                   log.error("inputStream close error! " + e.getMessage());
+                    log.error("inputStream close error! " + e.getMessage());
-               }
+                }
-           }
+            }
-       }
+        }
     }
 
     /**
      * <h1>更新流程sql</h1>
-     * @author xuanran.wang
+     *
-     * @dateTime 2023/3/30 19:18
+     * @param field     主表字段
-     * @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){
+    public void updateWorkFlow(String field, String tableName, String requestId) {
         String updateSQL = "update " + tableName + " set " + field + " = " + SUCCESS + " where requestid = ?";
         RecordSet recordSet = new RecordSet();
-        if(!recordSet.executeUpdate(updateSQL, requestId)){
+        if (!recordSet.executeUpdate(updateSQL, requestId)) {
             log.error(Util.logStr("update field error! sql: {}, requestId: {}", updateSQL, requestId));
             throw new CustomerException("更新表单字段失败!");
         }

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

@@ -74,6 +74,11 @@ 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,6 +37,7 @@ 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,4 +26,5 @@ 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 = "111";
+        String oaOutKey = "wld";
-        String sql = "select id from hrmresource where " + Util.null2DefaultStr(ShBigDataUtil.getPropertiesValByKey("ssoOaCompareField"),"outkey")  + " = #{outKey}";
+        String sql = "select id from hrmresource where loginid = #{outKey}";
         int id = otherSystemToOAMapper.selectUserIdByOutKey(sql, oaOutKey);
         log.info("id => " + id);
     }