1

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ProjectMapper.xml

@@ -2116,6 +2116,12 @@
                 #{item}
             </foreach>
         </if>
+        <if test="listFive!=null and listFive.size()>0">
+            and d.department_id in
+            <foreach collection="listFive" close=")" open="(" separator="," item="item">
+                #{item}
+            </foreach>
+        </if>
         GROUP BY p.id,tg.id ORDER BY p.id,d.department_id) AS f
         <where>
             realHour>0
@@ -2165,6 +2171,12 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="listFive!=null and listFive.size()>0">
+                and d.department_id in
+                <foreach collection="listFive" close=")" open="(" separator="," item="item">
+                    #{item}
+                </foreach>
+            </if>
             GROUP BY p.id,tg.id ORDER BY p.id,d.department_id) AS f
             <where>
                 realHour>0

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

@@ -250,6 +250,10 @@ public class WxCorpInfoController {
                 JSONObject apply_data = info.getJSONObject("apply_data");
                 System.out.println("获取到的单据信息===========>"+apply_data);
                 JSONArray contents = apply_data.getJSONArray("contents");
+                int count = planService.count(new LambdaQueryWrapper<Plan>().eq(Plan::getTaskChangeNoticeNum, info.getString("sp_no")));
+                if(count>0){
+                    continue;
+                }
                 //生成 车间插单计划
                 Plan plan=new Plan();
                 plan.setCompanyId(7);

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

@@ -356,7 +356,7 @@ public class TimingTask {
             return;
         }
         DateTimeFormatter df=DateTimeFormatter.ofPattern("yyyy-MM-dd");
-        LocalDate start=LocalDate.now().minusDays(1);
+        LocalDate start=LocalDate.now().minusDays(7);
         LocalDate end=LocalDate.now();
         JSONArray jsonArrayFilter = new JSONArray();
         JSONObject filter1 = new JSONObject();
@@ -393,6 +393,10 @@ public class TimingTask {
                 System.out.println("获取到的单据信息===========>"+apply_data);
                 JSONArray contents = apply_data.getJSONArray("contents");
                 //生成 车间插单计划
+                int count = planService.count(new LambdaQueryWrapper<Plan>().eq(Plan::getTaskChangeNoticeNum, info.getString("sp_no")));
+                if(count>0){
+                    continue;
+                }
                 Plan plan=new Plan();
                 plan.setCompanyId(7);
                 plan.setCreateTime(LocalDateTime.now());

fhKeeper/formulahousekeeper/management-workshop/src/main/resources/mapper/ReportMapper.xml

@@ -171,7 +171,7 @@
         left join plan on plan.id=r.plan_id
         left join user u on r.checker_id=u.id
         left join user u2 on r.creator_id=u2.id
-        where r.company_id=#{companyId}  and r.finish_num > 0
+        where r.company_id=#{companyId}  and ((plan.plan_type=0 and r.finish_num > 0) || plan.plan_type=1)
         <if test="date!=null and date!=''">
             and r.create_date=#{date}
         </if>