修改获取不同类型的报工模板

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

@@ -219,7 +219,8 @@ public class WxCorpInfoController {
         HttpRespMsg msg=new HttpRespMsg();
         JSONArray jsonArrayFilter = new JSONArray();
         JSONObject filter1 = new JSONObject();
-        WxCorpTemplate template = wxCorpTemplateService.getById(7);
+//        WxCorpTemplate template = wxCorpTemplateService.getById(7);
+        WxCorpTemplate template = wxCorpTemplateService.getOne(new QueryWrapper<WxCorpTemplate>().eq("company_id",7).eq("type",1));
         filter1.put("key","template_id");
         filter1.put("value",template.getTemplateId());
         jsonArrayFilter.add(filter1);

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

@@ -2060,7 +2060,8 @@ public class WxCorpInfoServiceImpl extends ServiceImpl<WxCorpInfoMapper, WxCorpI
     @Override
     public String getTemplateDetail(Integer companyId) throws Exception {
         WxCorpInfo wxCorpInfo = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("company_id",companyId));
-        WxCorpTemplate template = wxCorpTemplateService.getById(wxCorpInfo.getCompanyId());
+//        WxCorpTemplate template = wxCorpTemplateService.getById(wxCorpInfo.getCompanyId());
+        WxCorpTemplate template = wxCorpTemplateService.getOne(new QueryWrapper<WxCorpTemplate>().eq("company_id",7).eq("type",1));
         String url=GET_TEMPLATE_DETAIL.replace("ACCESS_TOKEN",getCorpAgentAccessToken(wxCorpInfo));
         HttpHeaders headers = new HttpHeaders();
         RestTemplate restTemplate = new RestTemplate();

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

@@ -362,7 +362,8 @@ public class TimingTask {
         LocalDate end=LocalDate.now();
         JSONArray jsonArrayFilter = new JSONArray();
         JSONObject filter1 = new JSONObject();
-        WxCorpTemplate template = wxCorpTemplateService.getById(7);
+//        WxCorpTemplate template = wxCorpTemplateService.getById(7);
+        WxCorpTemplate template = wxCorpTemplateService.getOne(new QueryWrapper<WxCorpTemplate>().eq("company_id",7).eq("type",1));
         filter1.put("key","template_id");
         filter1.put("value",template.getTemplateId());
         jsonArrayFilter.add(filter1);
@@ -866,9 +867,9 @@ public class TimingTask {
 
 
     public void getTemporaryJobApplicationNewWithDate(String endDate,String startDate) throws Exception {
-        if(isDev){
+        /*if(isDev){
             return;
-        }
+        }*/
         DateTimeFormatter df=DateTimeFormatter.ofPattern("yyyy-MM-dd");
 //        LocalDate start=LocalDate.now().minusDays(7);
 //        LocalDate end=LocalDate.now();