2/27 官方无效修改补

src/main/java/cn/cslg/pas/common/vo/invalidVO/QueryEvidenceReasonVO.java

@@ -18,6 +18,7 @@ public class QueryEvidenceReasonVO {
     private String evidenceDescription;
     private Integer evidenceReasonId;
     private  Integer featureGen;
+    private Integer featureOperateMode;
     private List<CompareLiterature> literatures;
     private List<AssoGroupFeature> featureHistories;
     /**

src/main/java/cn/cslg/pas/factorys/getOrderFactory/GetClientNameOrder.java

@@ -29,7 +29,11 @@ public class GetClientNameOrder implements GetOrderObject {
         if(ids.size()==0){
             return "";
         }
-        String idStr = StringUtils.join(ids, ",");
+        List<String> idsStr =new ArrayList<>();
+        ids.forEach(item->{idsStr.add(item.toString());});
+        idsStr.add("'null'");
+        orderBy =" COALESCE("+orderBy+",'null')";
+        String idStr = StringUtils.join(idsStr, ",");
         String orderStr = " field(" + orderBy + "," + idStr + ")";
         String re = orderStr;
         return re;

src/main/java/cn/cslg/pas/service/business/ReportProjectService.java

@@ -894,7 +894,7 @@ public class ReportProjectService extends ServiceImpl<ReportProjectMapper, Repor
             rootSql="p.tenant_id="+tenantId;
         }
         if (sqls.get(0) != null && !sqls.get(0).equals("") && !rootSql.equals("")) {
-            sqls.set(0, rootSql + " and" + "(" + sqls.get(0) + ")");
+            sqls.set(0, rootSql + " and " + "(" + sqls.get(0) + ")");
         } else if ((sqls.get(0) == null || sqls.get(0).equals("")) && !rootSql.equals("")) {
             sqls.set(0, rootSql);
         }

src/main/java/cn/cslg/pas/service/business/invalidReport/EvidenceReasonService.java

@@ -214,7 +214,7 @@ public class EvidenceReasonService extends ServiceImpl<EvidenceReasonMapper, Evi
         if(assoGroupFeatures.size()==0&&gen.equals(1)){
             assFWrapper = new LambdaQueryWrapper<>();
             assFWrapper.eq(AssoGroupFeature::getGroupId, groupId)
-                    .and(wrapper -> wrapper.eq(AssoGroupFeature::getFeatureGen, 0).or().eq(AssoGroupFeature::getOperateMode, 2));
+                    .and(wrapper -> wrapper.eq(AssoGroupFeature::getFeatureGen, 0).eq(AssoGroupFeature::getOperateMode, 2));
         }
         assoGroupFeatures = assoGroupFeatureService.list(assFWrapper);
         List<QueryEvidenceReasonVO> queryEvidenceReasonVOS = new ArrayList<>();
@@ -223,6 +223,7 @@ public class EvidenceReasonService extends ServiceImpl<EvidenceReasonMapper, Evi
                 //查询特征
                 Integer featureId = assoGroupFeature.getFeatureId();
                 Integer featureGen =assoGroupFeature.getFeatureGen();
+                Integer operateMode =assoGroupFeature.getOperateMode();
                 //根据特征id查询特征
                 Feature feature = featureService.getById(featureId);
                 Integer featureGroupId = assoGroupFeature.getId();
@@ -272,6 +273,7 @@ public class EvidenceReasonService extends ServiceImpl<EvidenceReasonMapper, Evi
                         queryEvidenceReasonVO.setFeatureGroupId(featureGroupId);
                         queryEvidenceReasonVO.setFeatureHistories(queryFeatureHistories);
                         queryEvidenceReasonVO.setFeatureGen(featureGen);
+                        queryEvidenceReasonVO.setFeatureOperateMode(operateMode);
                         //装载特征陈述信息
                         queryEvidenceReasonVO.setFeCommon(item.getCommon());
                         queryEvidenceReasonVO.setFeIfPresentOpinions1(item.getIfPresentOpinions1());

src/main/resources/jsons/event.json

@@ -145,5 +145,20 @@
     "ifGroup": "true",
     "ifShow": "false",
     "ifAsCondition": "true"
+  },
+  ,
+  {
+    "name": "客户",
+    "type": "String",
+    "value": "clientName",
+    "field": "clientName",
+    "sqlField": "client_id",
+    "sqlClass": "getClientNameSql",
+    "orderClass": "getClientNameOrder",
+    "groupClass": "",
+    "ifSearch": "false",
+    "ifGroup": "false",
+    "ifShow": "true",
+    "ifAsCondition": "false"
   }
 ]

src/main/resources/jsons/reportProject.json

@@ -164,7 +164,7 @@
     "type":"String",
     "value":"statusName",
     "field": "statusName",
-    "sqlField": "report_type",
+    "sqlField": "rp.status",
     "sqlClass": "getComSql",
     "orderClass": "getComOrder",
     "ifSearch":"false",
@@ -175,7 +175,7 @@
     "type":"Array",
     "value":"status",
     "field": "status",
-    "sqlField": "report_type",
+    "sqlField": "rp.status",
     "sqlClass": "getComSql",
     "orderClass": "getComOrder",
     "ifSearch":"true",