sop列表修改

sop-business/src/main/java/com/qmth/sop/business/service/impl/TBSopInfoServiceImpl.java

@@ -321,7 +321,13 @@ public class TBSopInfoServiceImpl extends ServiceImpl<TBSopInfoMapper, TBSopInfo
             LinkedMultiValueMap<String, FormWidgetMetadataParam> formWidgetMetadataParamLinkedMultiValueMap = new LinkedMultiValueMap<>(sopInfoListParam.getFormWidgetMetadataConditionList().size());
             for (FormWidgetMetadataParam f : sopInfoListParam.getFormWidgetMetadataConditionList()) {
                 if (Objects.nonNull(f.getOperator())) {
-                    formWidgetMetadataParamLinkedMultiValueMap.add(f.getFieldId(), f);
+                    //加入固定字段转换
+                    if (SystemConstant.SOP_TRANSFORM_MAP.containsKey(f.getFieldId())) {
+                        f.setFieldId(SystemConstant.SOP_TRANSFORM_MAP.get(f.getFieldId()));
+                        formWidgetMetadataParamLinkedMultiValueMap.add(SystemConstant.SOP_TRANSFORM_MAP.get(f.getFieldId()), f);
+                    } else {
+                        formWidgetMetadataParamLinkedMultiValueMap.add(f.getFieldId(), f);
+                    }
                 }
             }
             for (Map.Entry<String, List<FormWidgetMetadataParam>> entry : formWidgetMetadataParamLinkedMultiValueMap.entrySet()) {
@@ -331,12 +337,12 @@ public class TBSopInfoServiceImpl extends ServiceImpl<TBSopInfoMapper, TBSopInfo
                     for (int y = 0; y < formWidgetMetadataParamList.size(); y++) {
                         FormWidgetMetadataParam f = formWidgetMetadataParamList.get(y);
                         if (f.getOperator() == FormWidgetMetadataOperator.LIKE) {
-                            conditionJoin.add(f.getFieldId()).add(f.getOperator().getCode()).add("('%',").add(f.getFieldValue()).add(",'%')");
+                            conditionJoin.add(f.getFieldId()).add(f.getOperator().getCode()).add("('%','").add(f.getFieldValue()).add("','%')");
                             if (y < formWidgetMetadataParamList.size() - 1) {
                                 conditionJoin.add(" or ");
                             }
                         } else {
-                            conditionJoin.add(f.getFieldId()).add(f.getOperator().getCode()).add(f.getFieldValue());
+                            conditionJoin.add(f.getFieldId()).add(f.getOperator().getCode()).add("'").add(f.getFieldValue()).add("'");
                             if (y < formWidgetMetadataParamList.size() - 1) {
                                 conditionJoin.add(" or ");
                             }
@@ -347,9 +353,9 @@ public class TBSopInfoServiceImpl extends ServiceImpl<TBSopInfoMapper, TBSopInfo
                 } else {
                     for (FormWidgetMetadataParam f : formWidgetMetadataParamList) {
                         if (f.getOperator() == FormWidgetMetadataOperator.LIKE) {
-                            stringJoinerCondition.add(SystemConstant.AND).add(f.getFieldId()).add(f.getOperator().getCode()).add("('%',").add(f.getFieldValue()).add(",'%')").add("\r\n");
+                            stringJoinerCondition.add(SystemConstant.AND).add(f.getFieldId()).add(f.getOperator().getCode()).add("('%','").add(f.getFieldValue()).add("','%')").add("\r\n");
                         } else {
-                            stringJoinerCondition.add(SystemConstant.AND).add(f.getFieldId()).add(f.getOperator().getCode()).add(f.getFieldValue()).add("\r\n");
+                            stringJoinerCondition.add(SystemConstant.AND).add(f.getFieldId()).add(f.getOperator().getCode()).add("'").add(f.getFieldValue()).add("'").add("\r\n");
                         }
                     }
                 }

sop-business/src/main/resources/mapper/TBSopInfoMapper.xml

@@ -76,8 +76,9 @@
                (select group_concat(art.NAME_) from ACT_RU_TASK art where art.PROC_INST_ID_ = tffa.flow_id) as taskName,
                (select group_concat(art.TASK_DEF_KEY_) from ACT_RU_TASK art where art.PROC_INST_ID_ = tffa.flow_id) as taskDefKey,
                (select group_concat(cast(art.ID_ as char)) from ACT_RU_TASK art where art.PROC_INST_ID_ = tffa.flow_id) as taskId,
-               (select group_concat(us1.real_name SEPARATOR ';') from sys_user us1
-                where find_in_set(us1.id, (select tffl.pend_approve_id from t_f_flow_log tffl where tffl.flow_id = tfcfe.flow_id order by tffl.create_time desc limit 1))) as pendApproveName
+               <!--(select group_concat(us1.real_name SEPARATOR ';') from sys_user us1
+                where find_in_set(us1.id, (select tffl.pend_approve_id from t_f_flow_log tffl where tffl.flow_id = tfcfe.flow_id order by tffl.create_time desc limit 1))) as pendApproveName-->
+               su3.real_name as pendApproveName
                 <if test="fieldName != null and fieldName != ''">
                     ,${fieldName}
                 </if>
@@ -91,6 +92,8 @@
                  left join sys_user su2 on su2.id = tfcfe.create_id
                  left join t_f_flow_approve tffa on tffa.flow_id = tfcfe.flow_id
                  left join ACT_RU_TASK art on art.PROC_INST_ID_ = tffa.flow_id
+                 left join act_ru_identitylink ari on ari.TASK_ID_ = art.ID_
+                 left join sys_user su3 on su3.id = ari.USER_ID_
                  left join t_f_custom_flow tfcf on tfcf.id = tfcfe.t_f_custom_flow_id
                  <if test="tableName != null and tableName != ''">
                      left join ${tableName} t on t.flow_deployment_id = tfcf.flow_deployment_id

sop-common/src/main/java/com/qmth/sop/common/contant/SystemConstant.java

@@ -100,10 +100,15 @@ public class SystemConstant {
     public static final String LIST_JOIN_SPLIT = ",";
     public static final String JOB_DATA = "jobData";
     public static final String AND = " and ";
-//    public static final String APPROVE_MAP_VAR = "approve_map_var";
+    //    public static final String APPROVE_MAP_VAR = "approve_map_var";
 //    public static final String APPROVE_AUTO = "auto";
     public static final String SYSTEM_AUTO_APPROVE = "系统自动审批";
 
+    /**
+     * sop列表转换字段
+     */
+    public static Map<String, String> SOP_TRANSFORM_MAP = new LinkedHashMap<>();//sop固定列转换map
+
     /**
      * 流程动态表单字段
      */
@@ -310,6 +315,25 @@ public class SystemConstant {
     public static final Long LOCK_SEQUENCE_TIME_OUT = 60L * 1 * 1000;
     public static final Long LOCK_JOB_TIME_OUT = 60L * 5 * 1000;
 
+    static {
+        SOP_TRANSFORM_MAP.put("serviceName", "tbs.name");
+        SOP_TRANSFORM_MAP.put("sopNo", "tbsi.sop_no");
+        SOP_TRANSFORM_MAP.put("crmNo", "tbsi.crm_no");
+        SOP_TRANSFORM_MAP.put("beginTime", "tbc.begin_time");
+        SOP_TRANSFORM_MAP.put("customManagerName", "su1.real_name");
+        SOP_TRANSFORM_MAP.put("customManagerType", "sc.type");
+        SOP_TRANSFORM_MAP.put("customName", "sc.name");
+        SOP_TRANSFORM_MAP.put("crmName", "tbc.name");
+        SOP_TRANSFORM_MAP.put("productName", "tbp.name");
+        SOP_TRANSFORM_MAP.put("examStartTime", "tbc.exam_start_time");
+        SOP_TRANSFORM_MAP.put("examEndTime", "tbc.exam_end_time");
+        SOP_TRANSFORM_MAP.put("flowCreateName", "su2.real_name");
+        SOP_TRANSFORM_MAP.put("flowCreateTime", "tffa.create_time");
+        SOP_TRANSFORM_MAP.put("status", "tffa.status");
+        SOP_TRANSFORM_MAP.put("taskName", "art.NAME_");
+        SOP_TRANSFORM_MAP.put("pendApproveName", "ari.USER_ID_");
+    }
+
     /**
      * 获取数据库uuid
      *