1

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/controller/WxCorpInfoController.java

@@ -256,6 +256,7 @@ public class WxCorpInfoController {
                 plan.setCreateTime(LocalDateTime.now());
                 plan.setPlanType(1);
                 plan.setCreateId(first.get().getId());
+                plan.setTaskChangeNoticeNum(info.getString("sp_no"));
                 //参与人员列表
                 List<String> userTeams=new ArrayList<>();
                 //初始化 单价(元/小时)
@@ -306,12 +307,12 @@ public class WxCorpInfoController {
                             plan.setTaskName(text);
                         }
                     }
-                    if(title.getJSONObject(0).getString("text").equals("审批编号")){
-                        if(control.equals("Text")||control.equals("Textarea")){
-                            String text = value.getString("text");
-                            plan.setTaskChangeNoticeNum(text);
-                        }
-                    }
+//                    if(title.getJSONObject(0).getString("text").equals("审批编号")){
+//                        if(control.equals("Text")||control.equals("Textarea")){
+//                            String text = value.getString("text");
+//                            plan.setTaskChangeNoticeNum(text);
+//                        }
+//                    }
                     //先处理多个人员 公用此单据非工时部分内容
                     if(title.getJSONObject(0).getString("text").equals("参与人员")){
                         if(control.equals("Contact")){

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java

@@ -5012,13 +5012,17 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
 //            item.add(map.get("steelNumArray")==null?"":String.valueOf(map.get("steelNumArray")));
             item.add(map.get("projectName")==null?"":String.valueOf(map.get("projectName")));
 //            item.add(String.valueOf(map.get("productName")));
+            item.add(map.get("productSchedulingNum")==null?"":String.valueOf(map.get("productSchedulingNum")));
             if(planType==0){
-                item.add(map.get("productSchedulingNum")==null?"":String.valueOf(map.get("productSchedulingNum")));
+                item.add(map.get("productOrderNum")==null?"":String.valueOf(map.get("productOrderNum")));
             }else {
                 item.add(map.get("taskChangeNoticeNum")==null?"":String.valueOf(map.get("taskChangeNoticeNum")));
             }
-            item.add(map.get("productOrderNum")==null?"":String.valueOf(map.get("productOrderNum")));
-            item.add(map.get("procedureName")==null?"":String.valueOf(map.get("procedureName")));
+            if(planType==0){
+                item.add(map.get("procedureName")==null?"":String.valueOf(map.get("procedureName")));
+            }else {
+                item.add("临时报工");
+            }
             item.add(map.get("steelNumArray")==null?"":String.valueOf(map.get("steelNumArray")));
             item.add(map.get("productName")==null?"":String.valueOf(map.get("productName")));
             item.add("");

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/task/TimingTask.java

@@ -398,6 +398,7 @@ public class TimingTask {
                 plan.setCreateTime(LocalDateTime.now());
                 plan.setPlanType(1);
                 plan.setCreateId(first.get().getId());
+                plan.setTaskChangeNoticeNum(info.getString("sp_no"));
                 //参与人员列表
                 List<String> userTeams=new ArrayList<>();
                 //初始化 单价(元/小时)