流程完善

jeecg-boot/jeecg-boot-module-activiti/src/main/java/org/jeecg/modules/activiti/web/ActBusinessController.java

@@ -872,8 +872,16 @@ public class ActBusinessController {
             }
         }
 
+        Map<String,String> supplierMap = new HashMap<>();
         if("incident_ticket".equals(param.getTableName())){
             columnIncrease=columnIncrease+" cl.follow_up ";
+
+            List<Map<String,String>> supplierList = getSupplierSrm(null);
+
+            for(Map<String,String> m:supplierList){
+                supplierMap.put(m.get("label"),"");
+            }
+
         }else{
             //截掉最后一个符号","
             columnIncrease=columnIncrease.substring(0, columnIncrease.length() -1);
@@ -883,6 +891,26 @@ public class ActBusinessController {
         map.put("column1",column1);
         List<Map<String,Object>> list=iActBusinessService.getActBusinessList(map);
         list.forEach(e -> {
+
+            String incident_ticket__responsibility_company = e.get("incident_ticket__responsibility_company") == "" || e.get("incident_ticket__responsibility_company") == null ? "" : e.get("incident_ticket__responsibility_company").toString();
+            String incident_ticket__is_confirm = e.get("incident_ticket__is_confirm") == "" || e.get("incident_ticket__is_confirm") == null ? "" : e.get("incident_ticket__is_confirm").toString();
+            String result = e.get("result") == "" || e.get("result") == null ? "" : e.get("result").toString();
+
+            if(result.equals("0") && StringUtils.isNotBlank(incident_ticket__responsibility_company)
+                    && supplierMap.containsKey(incident_ticket__responsibility_company)){
+
+                String incident_ticket__id = e.get("incident_ticket__id") == "" || e.get("incident_ticket__id") == null ? "" : e.get("incident_ticket__id").toString();
+
+                int countNumChild = sysBaseAPI.getIncidentTicketChild(incident_ticket__id);//扣款
+                if(countNumChild > 0){
+                    if(incident_ticket__is_confirm.equals("1")){
+                        e.put("follow_up","工厂已确认");
+                    }else{
+                        e.put("follow_up","工厂待确认");
+                    }
+                }
+            }
+
             if(StrUtil.isNotBlank(e.get("procDefId").toString())){
                 ActZprocess actProcess = actZprocessService.getById(e.get("procDefId").toString());
                 e.put("routeName",actProcess.getRouteName());
@@ -1208,14 +1236,12 @@ public class ActBusinessController {
     public List<Map<String,String>> getSupplierSrm(String supplierName) {
         String active = getProjectConfigActive("active");
         List<Map<String,String>> supplierList = new ArrayList<>();
-
+        String URL="jdbc:sqlserver://192.168.1.16:1433;DatabaseName=srm_zs";
 //        String URL="jdbc:sqlserver://192.168.1.253:14330;DatabaseName=srm_prod";
 //
-//        if(!active.equals("senyu")){
-//            URL="jdbc:sqlserver://192.168.5.170:14330;DatabaseName=srm_prod";
-//        }
-
-        String URL="jdbc:sqlserver://192.168.1.16:1433;DatabaseName=srm_zs";
+        if(!active.equals("senyu")){
+            URL="jdbc:sqlserver://192.168.5.170:14330;DatabaseName=srm_prod";
+        }
 
         String USER="sa";
         String PASSWORD="Windows2008R2";
@@ -1230,6 +1256,10 @@ public class ActBusinessController {
             sta =con.createStatement();
 
             String sql="select short_name from bm_supplier where del_flag=0 and short_name='"+supplierName+"'";
+            if(StringUtils.isBlank(supplierName)){
+
+               sql="select short_name from bm_supplier where del_flag=0 ";
+            }
 
             rs =sta.executeQuery(sql);
             while(rs.next()) {