修改

ruoyi-admin/src/main/java/com/ruoyi/web/controller/TaskController.java

@@ -0,0 +1,21 @@
+package com.ruoyi.web.controller;
+
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.framework.web.service.Task;
+import com.ruoyi.system.domain.projectV2.XmConstructionRate;
+import com.ruoyi.system.service.projectV2.IXmConstructionRateService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+
+import java.util.List;
+
+public class TaskController {
+
+    @Autowired
+    private Task task;
+
+    @GetMapping("/task/generateDb")
+    public void generateDb() throws Exception {
+        task.generateDb();
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/projectV2/ZsyzDbdController.java

@@ -97,7 +97,7 @@ public class ZsyzDbdController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('projectV2:dbd:edit')")
     @Log(title = "招商引资_督办单", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping("/put")
     public AjaxResult edit(@RequestBody ZsyzDbd zsyzDbd)
     {
         return toAjax(zsyzDbdService.updateZsyzDbd(zsyzDbd));
@@ -108,7 +108,7 @@ public class ZsyzDbdController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('projectV2:dbd:remove')")
     @Log(title = "招商引资_督办单", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
+	@GetMapping("/delete/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
         return toAjax(zsyzDbdService.deleteZsyzDbdByIds(ids));

ruoyi-admin/src/main/java/com/ruoyi/web/controller/projectV2/ZsyzJzqkTsController.java

@@ -92,7 +92,7 @@ public class ZsyzJzqkTsController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:ts:edit')")
     @Log(title = "招商引资_进展情况_提示(当承接地已承接，但15天未填写签约信息的记录信息，前端给出提示框)", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping("/put")
     public AjaxResult edit(@RequestBody ZsyzJzqkTs zsyzJzqkTs)
     {
         return toAjax(zsyzJzqkTsService.updateZsyzJzqkTs(zsyzJzqkTs));
@@ -103,7 +103,7 @@ public class ZsyzJzqkTsController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:ts:remove')")
     @Log(title = "招商引资_进展情况_提示(当承接地已承接，但15天未填写签约信息的记录信息，前端给出提示框)", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
+	@GetMapping("/delete/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
         return toAjax(zsyzJzqkTsService.deleteZsyzJzqkTsByIds(ids));

ruoyi-admin/src/main/java/com/ruoyi/web/controller/projectV2/ZsyzLcjlController.java

@@ -85,7 +85,7 @@ public class ZsyzLcjlController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:lcjl:edit')")
     @Log(title = "招商引资_流程记录", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping("/put")
     public AjaxResult edit(@RequestBody ZsyzLcjl zsyzLcjl)
     {
         return toAjax(zsyzLcjlService.updateZsyzLcjl(zsyzLcjl));
@@ -96,7 +96,7 @@ public class ZsyzLcjlController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:lcjl:remove')")
     @Log(title = "招商引资_流程记录", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
+	@GetMapping("/delete/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
         return toAjax(zsyzLcjlService.deleteZsyzLcjlByIds(ids));

ruoyi-admin/src/main/java/com/ruoyi/web/controller/projectV2/ZsyzProjectDeptController.java

@@ -85,7 +85,7 @@ public class ZsyzProjectDeptController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('projectV2:dept:edit')")
     @Log(title = "招商引资_项目和部门关联", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping("/put")
     public AjaxResult edit(@RequestBody ZsyzProjectDept zsyzProjectDept)
     {
         return toAjax(zsyzProjectDeptService.updateZsyzProjectDept(zsyzProjectDept));
@@ -96,7 +96,7 @@ public class ZsyzProjectDeptController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('projectV2:dept:remove')")
     @Log(title = "招商引资_项目和部门关联", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
+	@GetMapping("/delete/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
         return toAjax(zsyzProjectDeptService.deleteZsyzProjectDeptByIds(ids));

ruoyi-admin/src/main/java/com/ruoyi/web/controller/projectV2/ZsyzShqxXmController.java

@@ -85,7 +85,7 @@ public class ZsyzShqxXmController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:xm:edit')")
     @Log(title = "招商引资_审核期限_项目", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping("/put")
     public AjaxResult edit(@RequestBody ZsyzShqxXm zsyzShqxXm)
     {
         return toAjax(zsyzShqxXmService.updateZsyzShqxXm(zsyzShqxXm));
@@ -96,7 +96,7 @@ public class ZsyzShqxXmController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:xm:remove')")
     @Log(title = "招商引资_审核期限_项目", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
+	@GetMapping("/delete/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
         return toAjax(zsyzShqxXmService.deleteZsyzShqxXmByIds(ids));

ruoyi-admin/src/main/java/com/ruoyi/web/controller/projectV2/ZsyzSkSwtzdwController.java

@@ -86,7 +86,7 @@ public class ZsyzSkSwtzdwController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('projectV2:swtzdw:edit')")
     @Log(title = "招商引资_省库项目_省外投资单位", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping("/put")
     public AjaxResult edit(@RequestBody ZsyzSkSwtzdw zsyzSkSwtzdw)
     {
         return toAjax(zsyzSkSwtzdwService.updateZsyzSkSwtzdw(zsyzSkSwtzdw));
@@ -97,7 +97,7 @@ public class ZsyzSkSwtzdwController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('projectV2:swtzdw:remove')")
     @Log(title = "招商引资_省库项目_省外投资单位", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
+	@GetMapping("/delete/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
         return toAjax(zsyzSkSwtzdwService.deleteZsyzSkSwtzdwByIds(ids));

ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -111,7 +111,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 // 过滤请求
                 .authorizeRequests()
                 // 对于登录login 注册register 验证码captchaImage 允许匿名访问
-                .antMatchers("/login", "/register", "/captchaImage","/system/app/new").permitAll()
+                .antMatchers("/login", "/register", "/captchaImage","/system/app/new","/task/generateDb").permitAll()
                 // 静态资源，可匿名访问
                 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
                 .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()

ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/Task.java

@@ -93,7 +93,7 @@ public class Task {
      * */
     @Async
     //@Scheduled(cron = "0 0/2 * * * ? ")
-    //@Scheduled(cron = "0 1 0 * * ? ")
+    @Scheduled(cron = "0 19 0 * * ? ")
     public void generateDb() throws Exception {
 
         //查询当前年的借鉴日信息
@@ -142,6 +142,9 @@ public class Task {
         String deptName = "";
         String qx = "";
         for (ZsyzLcjl zsyzLcjl : zsyzLcjlList) {
+            if(StringUtils.isEmpty(zsyzLcjl.getProgress()) || StringUtils.isEmpty(zsyzLcjl.getXmStatus())){
+                continue;
+            }
             //项目首谈阶段
             if (zsyzLcjl.getProgress().equals(CommonConstants.ONE)) {
 
@@ -497,7 +500,7 @@ public class Task {
                         zsyzDb.setDh(sjs());
                         zsyzDb.setXmId(zsyzLcjl.getXmId());
                         zsyzDb.setXmbh(zsyzLcjl.getXmbh());
-                        zsyzDb.setXmbh(zsyzLcjl.getXmmc());
+                        zsyzDb.setXmmc(zsyzLcjl.getXmmc());
                         //todo 查询督办部门
                         zsyzDb.setDeptId(deptId);
                         zsyzDb.setDeptName(deptName);
@@ -561,7 +564,7 @@ public class Task {
                     zsyzDb.setDh(sjs());
                     zsyzDb.setXmId(zsyzLcjl.getXmId());
                     zsyzDb.setXmbh(zsyzLcjl.getXmbh());
-                    zsyzDb.setXmbh(zsyzLcjl.getXmmc());
+                    zsyzDb.setXmmc(zsyzLcjl.getXmmc());
                     //todo 查询督办部门
                     zsyzDb.setDeptId(deptId);
                     zsyzDb.setDeptName(deptName);
@@ -622,7 +625,7 @@ public class Task {
                 zsyzDb.setDh(sjs());
                 zsyzDb.setXmId(zsyzLcjl.getXmId());
                 zsyzDb.setXmbh(zsyzLcjl.getXmbh());
-                zsyzDb.setXmbh(zsyzLcjl.getXmmc());
+                zsyzDb.setXmmc(zsyzLcjl.getXmmc());
                 //todo 查询督办部门
                 zsyzDb.setDeptId(deptId);
                 zsyzDb.setDeptName(deptName);
@@ -705,7 +708,7 @@ public class Task {
                         zsyzDb.setDh(sjs());
                         zsyzDb.setXmId(zsyzLcjl.getXmId());
                         zsyzDb.setXmbh(zsyzLcjl.getXmbh());
-                        zsyzDb.setXmbh(zsyzLcjl.getXmmc());
+                        zsyzDb.setXmmc(zsyzLcjl.getXmmc());
                         //todo 查询督办部门
                         zsyzDb.setDeptId(deptId);
                         zsyzDb.setDeptName(deptName);
@@ -767,7 +770,7 @@ public class Task {
                     zsyzDb.setDh(sjs());
                     zsyzDb.setXmId(zsyzLcjl.getXmId());
                     zsyzDb.setXmbh(zsyzLcjl.getXmbh());
-                    zsyzDb.setXmbh(zsyzLcjl.getXmmc());
+                    zsyzDb.setXmmc(zsyzLcjl.getXmmc());
                     //todo 查询督办部门
                     zsyzDb.setDeptId(deptId);
                     zsyzDb.setDeptName(deptName);
@@ -828,7 +831,7 @@ public class Task {
                 zsyzDb.setDh(sjs());
                 zsyzDb.setXmId(zsyzLcjl.getXmId());
                 zsyzDb.setXmbh(zsyzLcjl.getXmbh());
-                zsyzDb.setXmbh(zsyzLcjl.getXmmc());
+                zsyzDb.setXmmc(zsyzLcjl.getXmmc());
                 //todo 查询督办部门
                 zsyzDb.setDeptId(deptId);
                 zsyzDb.setDeptName(deptName);
@@ -860,7 +863,7 @@ public class Task {
     @Scheduled(cron = "0 1 0 * * ? ")
     public void popover() throws Exception {
         //获取当前时间
-        String endTime = DateUtils.getYear();
+        String endTime = DateUtils.getDate();
         //查询在承接地承接阶段的项目
         ZsyzSbbzb zsyzSbbzb = new ZsyzSbbzb();
         zsyzSbbzb.setType("1");
@@ -869,6 +872,9 @@ public class Task {
         List<ZsyzSbbzb> zsyzSbbzbList = zsyzSbbzbMapper.selectZsyzSbbzbList(zsyzSbbzb);
         //停留在该状态时间超过15天的弹窗
         for (ZsyzSbbzb sbbzb : zsyzSbbzbList) {
+            if(sbbzb.getUpdateTime()==null){
+                continue;
+            }
             String strTime = DateFormatUtils.format(sbbzb.getUpdateTime(), "yyyy-MM-dd");
             int i = DateUtils.daysBetween(strTime,endTime);
             if(i>15){
@@ -878,14 +884,14 @@ public class Task {
                 zsyzJzqkTs.setXmmc(sbbzb.getXmxsmc());
                 zsyzJzqkTs.setDeptId(sbbzb.getCjdId());
                 zsyzJzqkTs.setDeptName(sbbzb.getCjdName());
-                zsyzJzqkTs.setDetails("已超过15天为填写签约信息，请补充当前项目进展情况。");
+                zsyzJzqkTs.setDetails("已超过15天未填写签约信息，请补充当前项目进展情况。");
                 zsyzJzqkTs.setIsDel("N");
                 zsyzJzqkTs.setCreateTime(DateUtils.getNowDate());
                 zsyzJzqkTs.setUpdateTime(DateUtils.getNowDate());
                 zsyzJzqkTsMapper.insertZsyzJzqkTs(zsyzJzqkTs);
 
                 //发送短信
-                List<SendSmsConfig> sendSmsConfigs = new ArrayList<>();
+                /*List<SendSmsConfig> sendSmsConfigs = new ArrayList<>();
                 List<SysUser> sysUsers = sysUserService.selectUserByDeptId(sbbzb.getCjdId());
                 if (sysUsers != null) {
 
@@ -911,7 +917,7 @@ public class Task {
                     if (sendSmsConfigs.size() > 0) {
                         AsyncManager.me().execute(AsyncFactory.sendSms(sendSmsConfigs, "SMS_272615944"));
                     }
-                }
+                }*/
 
             }
         }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/fgw/FgwXmsbServiceImpl.java

@@ -110,14 +110,16 @@ public class FgwXmsbServiceImpl implements IFgwXmsbService {
 
         //判断是否填写节点安排
         FgwXmsb xmsb = fgwXmsbMapper.selectFgwXmsbById(fgwXmsb.getId());
-        String year = DateUtils.dateToStrLong(xmsb.getCreateTime(),"YYYY");
+        String year = DateUtils.dateToStrLong(xmsb.getCreateTime(), "YYYY");
         FgwJdap fgwJdap = new FgwJdap();
         fgwJdap.setXmId(fgwXmsb.getId());
         fgwJdap.setYear(year);
         fgwJdap.setShjg("1");
-        List<FgwJdap> fgwJdapList = fgwJdapMapper.selectFgwJdapList(fgwJdap);
-        if(fgwJdapList==null || fgwJdapList.size()<12){
-            return AjaxResult.error("上传失败，节点安排信息未完善或节点安排信息审核未通过！");
+        if ("2".equals(fgwXmsb.getType())) {
+            List<FgwJdap> fgwJdapList = fgwJdapMapper.selectFgwJdapList(fgwJdap);
+            if (fgwJdapList == null || fgwJdapList.size() < 12) {
+                return AjaxResult.error("上传失败，节点安排信息未完善或节点安排信息审核未通过！");
+            }
         }
 
         fgwXmsb.setUpdateTime(DateUtils.getNowDate());
@@ -136,7 +138,7 @@ public class FgwXmsbServiceImpl implements IFgwXmsbService {
             //保存新增的
             for (FgwFj fgwFj : fjList) {
                 String isSh = fgwFj.getIsSh();
-                if (StringUtils.isBlank(isSh) || ONE.equals(isSh)){
+                if (StringUtils.isBlank(isSh) || ONE.equals(isSh)) {
                     fgwFjMapper.insertFgwFj(fgwFj);
                 }
             }
@@ -200,7 +202,7 @@ public class FgwXmsbServiceImpl implements IFgwXmsbService {
         //List<FgwDbd> fgwDbdList = fgwDbdMapper.selectFgwDbdYjxmNum();
         //查询预警配置时间
         FgwYjpz fgwYjpz = fgwYjpzMapper.selectFgwYjpzNew();
-        if(fgwYjpz==null){
+        if (fgwYjpz == null) {
             fgwYjpz = new FgwYjpz();
             fgwYjpz.setYzcqts(7L);
         }
@@ -219,8 +221,7 @@ public class FgwXmsbServiceImpl implements IFgwXmsbService {
     /**
      * 设置请求分页数据
      */
-    protected void startPage()
-    {
+    protected void startPage() {
         PageUtils.startPage();
     }
 

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/projectV2/ZsyzDbdServiceImpl.java

@@ -68,6 +68,7 @@ public class ZsyzDbdServiceImpl implements IZsyzDbdService
     @Override
     public int updateZsyzDbd(ZsyzDbd zsyzDbd)
     {
+        zsyzDbd.setIsHf("Y");
         zsyzDbd.setUpdateTime(DateUtils.getNowDate());
         return zsyzDbdMapper.updateZsyzDbd(zsyzDbd);
     }

ruoyi-system/src/main/resources/mapper/system/projectV2/ZsyzDbdMapper.xml

@@ -43,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="dh != null  and dh != ''"> and dh = #{dh}</if>
             <if test="xmId != null "> and xm_id = #{xmId}</if>
             <if test="xmbh != null  and xmbh != ''"> and xmbh = #{xmbh}</if>
-            <if test="xmmc != null  and xmmc != ''"> and xmmc = #{xmmc}</if>
+            <if test="xmmc != null  and xmmc != ''"> and xmmc like concat('%', #{xmmc}, '%')</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="deptName != null  and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if>
             <if test="isHf != null  and isHf != ''"> and is_hf = #{isHf}</if>

ruoyi-system/src/main/resources/mapper/system/projectV2/ZsyzLcjlMapper.xml

@@ -44,20 +44,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
 
-    <!--<select id="selectZsyzLcjlListQc" parameterType="ZsyzLcjl" resultMap="ZsyzLcjlResult">
+    <select id="selectZsyzLcjlListQc" parameterType="ZsyzLcjl" resultMap="ZsyzLcjlResult">
         select ANY_VALUE(a.id) as id, ANY_VALUE(a.xm_id) as xm_id, ANY_VALUE(a.xmbh) as xmbh, ANY_VALUE(a.xmmc)as xmmc,
-               ANY_VALUE(a.dept_id) as dept_id, ANY_VALUE(a.dept_name) as dept_name, ANY_VALUE(MAX(a.cl_time)) as cl_time, ANY_VALUE(a.progress) as progress
-        from (select id, xm_id, xmbh, xmmc, dept_id, dept_name, cl_time, progress
+               ANY_VALUE(a.dept_id) as dept_id, ANY_VALUE(a.dept_name) as dept_name, ANY_VALUE(MAX(a.cl_time)) as cl_time, ANY_VALUE(a.progress) as progress, ANY_VALUE(a.xm_status) as xm_status
+        from (select id, xm_id, xmbh, xmmc, dept_id, dept_name, cl_time, progress, xm_status
         from zsyz_lcjl order by xm_id, cl_time desc) a group by xm_id
-    </select>-->
-
-    <select id="selectZsyzLcjlListQc" resultType="com.ruoyi.system.domain.projectV2.ZsyzLcjl">
-        select id, xm_id, xmbh, xmmc,
-               dept_id, dept_name, MAX(cl_time) as cl_time, progress
-        from (select id, xm_id, xmbh, xmmc, dept_id, dept_name, cl_time) as cl_time, progress
-              from zsyz_lcjl order by xm_id, cl_time desc) a group by xm_id
     </select>
 
+    <!--<select id="selectZsyzLcjlListQc" resultType="com.ruoyi.system.domain.projectV2.ZsyzLcjl">
+        select id, xm_id, xmbh, xmmc,dept_id, dept_name, MAX(cl_time) as cl_time, progress, xm_status
+        from (select id, xm_id, xmbh, xmmc, dept_id, dept_name, cl_time , progress, xm_status
+        from zsyz_lcjl order by xm_id, cl_time desc) a group by xm_id
+    </select>-->
+
     <insert id="insertZsyzLcjl" parameterType="ZsyzLcjl" useGeneratedKeys="true" keyProperty="id">
         insert into zsyz_lcjl
         <trim prefix="(" suffix=")" suffixOverrides=",">

ruoyi-system/src/main/resources/mapper/system/projectV2/ZsyzSbbzbMapper.xml

@@ -275,7 +275,7 @@
         s.tzrxm, s.tzrzw, s.tzrdh, s.xmjj,s.xmjzqk, s.name,
         s.strq, s.phone, s.zw, s.user_id, s.create_by, s.type, s.progress,s.xm_status, s.dept_id, s.create_time, s.update_by,
         s.is_del, s.update_time, s.remark, s.cjd_id,
-        s.cjd_name, s.is_meet, s.meet_remark,s.shjg,s.psnr,s.czwt,
+        s.cjd_name, s.is_meet, s.meet_remark,s.shjg,s.psnr,s.czwt,s.update_time,
         q.id, q.xm_id, q.xmbh, q.xmmc, q.dfqyr, q.wfqyr, q.tbrq, q.qyrq,q.xytzely, q.xytze, q.swzj, q.gdzctze,
         q.xmgjrxm,q.xmgjrzw,q.xmgjrsjh,
         q.xmszd, q.sshy, q.tzfs, q.jsfs, q.sfys, q.jsnr,