计算节假日

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

@@ -0,0 +1,111 @@
+package com.ruoyi.web.controller.projectV2;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.utils.SecurityUtils;
+import org.apache.catalina.security.SecurityUtil;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.domain.projectV2.ZsyzJzqkTs;
+import com.ruoyi.system.service.projectV2.IZsyzJzqkTsService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 招商引资_进展情况_提示(当承接地已承接，但15天未填写签约信息的记录信息，前端给出提示框)Controller
+ * 
+ * @author ruoyi
+ * @date 2023-03-06
+ */
+@RestController
+@RequestMapping("/projectV2/ts")
+public class ZsyzJzqkTsController extends BaseController
+{
+    @Autowired
+    private IZsyzJzqkTsService zsyzJzqkTsService;
+
+    /**
+     * 查询招商引资_进展情况_提示(当承接地已承接，但15天未填写签约信息的记录信息，前端给出提示框)列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:ts:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(ZsyzJzqkTs zsyzJzqkTs)
+    {
+        startPage();
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        zsyzJzqkTs.setDeptId(user.getDeptId());
+        zsyzJzqkTs.setIsDel("N");
+        List<ZsyzJzqkTs> list = zsyzJzqkTsService.selectZsyzJzqkTsList(zsyzJzqkTs);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出招商引资_进展情况_提示(当承接地已承接，但15天未填写签约信息的记录信息，前端给出提示框)列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:ts:export')")
+    @Log(title = "招商引资_进展情况_提示(当承接地已承接，但15天未填写签约信息的记录信息，前端给出提示框)", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, ZsyzJzqkTs zsyzJzqkTs)
+    {
+        List<ZsyzJzqkTs> list = zsyzJzqkTsService.selectZsyzJzqkTsList(zsyzJzqkTs);
+        ExcelUtil<ZsyzJzqkTs> util = new ExcelUtil<ZsyzJzqkTs>(ZsyzJzqkTs.class);
+        util.exportExcel(response, list, "招商引资_进展情况_提示(当承接地已承接，但15天未填写签约信息的记录信息，前端给出提示框)数据");
+    }
+
+    /**
+     * 获取招商引资_进展情况_提示(当承接地已承接，但15天未填写签约信息的记录信息，前端给出提示框)详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:ts:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(zsyzJzqkTsService.selectZsyzJzqkTsById(id));
+    }
+
+    /**
+     * 新增招商引资_进展情况_提示(当承接地已承接，但15天未填写签约信息的记录信息，前端给出提示框)
+     */
+    @PreAuthorize("@ss.hasPermi('system:ts:add')")
+    @Log(title = "招商引资_进展情况_提示(当承接地已承接，但15天未填写签约信息的记录信息，前端给出提示框)", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody ZsyzJzqkTs zsyzJzqkTs)
+    {
+        return toAjax(zsyzJzqkTsService.insertZsyzJzqkTs(zsyzJzqkTs));
+    }
+
+    /**
+     * 修改招商引资_进展情况_提示(当承接地已承接，但15天未填写签约信息的记录信息，前端给出提示框)
+     */
+    @PreAuthorize("@ss.hasPermi('system:ts:edit')")
+    @Log(title = "招商引资_进展情况_提示(当承接地已承接，但15天未填写签约信息的记录信息，前端给出提示框)", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody ZsyzJzqkTs zsyzJzqkTs)
+    {
+        return toAjax(zsyzJzqkTsService.updateZsyzJzqkTs(zsyzJzqkTs));
+    }
+
+    /**
+     * 删除招商引资_进展情况_提示(当承接地已承接，但15天未填写签约信息的记录信息，前端给出提示框)
+     */
+    @PreAuthorize("@ss.hasPermi('system:ts:remove')")
+    @Log(title = "招商引资_进展情况_提示(当承接地已承接，但15天未填写签约信息的记录信息，前端给出提示框)", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(zsyzJzqkTsService.deleteZsyzJzqkTsByIds(ids));
+    }
+}

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

@@ -59,6 +59,7 @@ public class ZsyzSbbzbController extends BaseController
     /**
      * 导出招商引资_申报_首谈信息_主列表
      */
+    @PreAuthorize("@ss.hasPermi('projectV2:sbbzb:export')")
     @Log(title = "招商引资_申报_首谈信息_主", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, ZsyzSbbzb zsyzSbbzb)

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysHolidayController.java

@@ -0,0 +1,104 @@
+package com.ruoyi.web.controller.system;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.domain.SysHoliday;
+import com.ruoyi.system.service.ISysHolidayService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 节假日，需每年手动更新Controller
+ * 
+ * @author ruoyi
+ * @date 2023-03-04
+ */
+@RestController
+@RequestMapping("/system/holiday")
+public class SysHolidayController extends BaseController
+{
+    @Autowired
+    private ISysHolidayService sysHolidayService;
+
+    /**
+     * 查询节假日，需每年手动更新列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:holiday:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SysHoliday sysHoliday)
+    {
+        startPage();
+        List<SysHoliday> list = sysHolidayService.selectSysHolidayList(sysHoliday);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出节假日，需每年手动更新列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:holiday:export')")
+    @Log(title = "节假日，需每年手动更新", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SysHoliday sysHoliday)
+    {
+        List<SysHoliday> list = sysHolidayService.selectSysHolidayList(sysHoliday);
+        ExcelUtil<SysHoliday> util = new ExcelUtil<SysHoliday>(SysHoliday.class);
+        util.exportExcel(response, list, "节假日，需每年手动更新数据");
+    }
+
+    /**
+     * 获取节假日，需每年手动更新详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:holiday:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(sysHolidayService.selectSysHolidayById(id));
+    }
+
+    /**
+     * 新增节假日，需每年手动更新
+     */
+    @PreAuthorize("@ss.hasPermi('system:holiday:add')")
+    @Log(title = "节假日，需每年手动更新", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SysHoliday sysHoliday)
+    {
+        return toAjax(sysHolidayService.insertSysHoliday(sysHoliday));
+    }
+
+    /**
+     * 修改节假日，需每年手动更新
+     */
+    @PreAuthorize("@ss.hasPermi('system:holiday:edit')")
+    @Log(title = "节假日，需每年手动更新", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SysHoliday sysHoliday)
+    {
+        return toAjax(sysHolidayService.updateSysHoliday(sysHoliday));
+    }
+
+    /**
+     * 删除节假日，需每年手动更新
+     */
+    @PreAuthorize("@ss.hasPermi('system:holiday:remove')")
+    @Log(title = "节假日，需每年手动更新", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(sysHolidayService.deleteSysHolidayByIds(ids));
+    }
+}

ruoyi-admin/src/main/resources/application.yml

@@ -18,8 +18,9 @@ spring:
   messages:
     # 国际化资源文件路径
     basename: i18n/messages
-  profiles: 
+  profiles:
     active: druid
+    #active: prod
   # 文件上传
   servlet:
      multipart:

ruoyi-common/src/main/java/com/ruoyi/common/constant/CommonConstants.java

@@ -58,6 +58,17 @@ public class CommonConstants {
     public static final String  TC= "tc";
     public static final String  SK= "sk";
 
+    //督办期限判断
+    public static final String  STSHQX= "首谈审核期限 ";
+    public static final String  YSBMSHQX= "要素部门审核期限 ";
+    public static final String  CJDCJQX= "承接地承接期限 ";
+    public static final String  QYLRQX= "签约信息录入期限 ";
+    public static final String  QYSHQX= "签约信息审核期限 ";
+    public static final String  KGLRQX= "开工信息录入期限 ";
+    public static final String  KGSHQX= "开工信息审核期限 ";
+    public static final String  TCLRQX= "投产信息录入期限 ";
+    public static final String  TCSHQX= "投产信息审核期限 ";
+
 
 
 

ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java

@@ -11,6 +11,7 @@ import java.time.ZonedDateTime;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
+import java.util.List;
 
 import org.apache.commons.lang3.time.DateFormatUtils;
 
@@ -205,9 +206,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
      * @return
      * @throws ParseException
      */
-    public static int calc(String start, String stop) throws ParseException {
-
-
+    public static int calc(String start, String stop, List<String> lawHolidays, List<String> extraWorkdays) throws Exception {
         String pattern = "yyyy-MM-dd";
         Date begin = DateUtils.parseDate(start, pattern);
         Date endTime = DateUtils.parseDate(stop, pattern);
@@ -223,8 +222,8 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
         String ymd = null;
         while (c.getTime().before(end)) {
             ymd = DateFormatUtils.format(c.getTime(), pattern);
-            // 不是法定节假日 是否是法定节假日  0 上班 1周末 2节假日
-            if ("0".equals(HolidayUtils.request(ymd))) {
+            //
+            if (HolidayUtils.isHoliday(ymd,lawHolidays,extraWorkdays)) {
                 count++;
             }
             c.add(Calendar.DATE, 1);

ruoyi-common/src/main/java/com/ruoyi/common/utils/HolidayUtils.java

@@ -1,61 +1,103 @@
 package com.ruoyi.common.utils;
 
+import com.alibaba.fastjson2.JSONObject;
+
 import java.io.BufferedReader;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
 import java.net.URL;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
 
 public class HolidayUtils {
 
-    public static String request( String httpArg) {
-
-        String httpUrl="http://tool.bitefu.net/jiari/";
-
-        BufferedReader reader = null;
+    /**
+     * @author  qyw
+     * @description  判断是否是法定假日
+     * @date Created in 21:03 2019/1/31
+     **/
+    public static boolean isLawHoliday(String calendar, List<String> lawHolidays) throws Exception {
+        HolidayUtils.isValidDate(calendar);
+        if (lawHolidays.contains(calendar)) {
+            return true;
+        }
+        return false;
+    }
 
-        String result = null;
+    /**
+     * @author  qyw
+     * @description  判断是否是周末
+     * @date Created in 21:03 2019/1/31
+     **/
+    public static boolean isWeekends(String calendar) throws Exception {
+        HolidayUtils.isValidDate(calendar);
+        // 先将字符串类型的日期转换为Calendar类型
+        SimpleDateFormat sdf  = new SimpleDateFormat("yyyy-MM-dd");
+        Date date = sdf.parse(calendar);
+        Calendar ca   = Calendar.getInstance();
+        ca.setTime(date);
+        if (ca.get(Calendar.DAY_OF_WEEK) == Calendar.SATURDAY
+                || ca.get(Calendar.DAY_OF_WEEK) == Calendar.SUNDAY) {
+            return true;
+        }
+        return false;
+    }
 
-        StringBuffer sbf = new StringBuffer();
+    /**
+     * @author  qyw
+     * @description  判断是否是需要额外补班的周末
+     * @date Created in 21:06 2019/1/31
+     **/
+    public static boolean isExtraWorkday(String calendar, List<String> extraWorkdays) throws Exception {
+        HolidayUtils.isValidDate(calendar);
+        if (extraWorkdays.contains(calendar)) {
+            return true;
+        }
+        return false;
+    }
 
-        httpUrl = httpUrl + "?d=" + httpArg;
+    /**
+     * @author  qyw
+     * @description  判断是否是休息日（包含法定节假日和不需要补班的周末）
+     * @date Created in 21:06 2019/1/31
+     **/
+    public static boolean isHoliday(String calendar, List<String> lawHolidays, List<String> extraWorkdays) throws Exception {
+        HolidayUtils.isValidDate(calendar);
+        // 首先法定节假日必定是休息日
+        if (isLawHoliday(calendar,lawHolidays)) {
+            return true;
+        }
+        // 排除法定节假日外的非周末必定是工作日
+        if (!isWeekends(calendar)) {
+            return false;
+        }
+        // 所有周末中只有非补班的才是休息日
+        if (isExtraWorkday(calendar,extraWorkdays)) {
+            return false;
+        }
+        return true;
+    }
 
+    /**
+     * @author  qyw
+     * @description  校验字符串是否为指定的日期格式,含逻辑严格校验,2007/02/30返回false
+     * @date Created in 21:06 2019/1/31
+     **/
+    private static boolean isValidDate(String str) {
+        boolean convertSuccess = true;
+        // 指定日期格式为四位年/两位月份/两位日期，注意yyyy-MM-dd区分大小写；
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
         try {
-
-            URL url = new URL(httpUrl);
-
-            HttpURLConnection connection = (HttpURLConnection) url
-
-                    .openConnection();
-
-            connection.setRequestMethod("GET");
-
-            connection.connect();
-
-            InputStream is = connection.getInputStream();
-
-            reader = new BufferedReader(new InputStreamReader(is, "UTF-8"));
-
-            String strRead = null;
-
-            while ((strRead = reader.readLine()) != null) {
-                sbf.append(strRead);
-            }
-
-            reader.close();
-
-            result = sbf.toString();
-
-            //Map map= (Map) JSON.parse(result);
-
-            //String res=(String)map.get(httpArg);
-
+            // 设置lenient为false.
+            // 否则SimpleDateFormat会比较宽松地验证日期，比如2007/02/29会被接受，并转换成2007/03/01
+            format.setLenient(false);
+            format.parse(str);
         } catch (Exception e) {
-
-            e.printStackTrace();
-
+            convertSuccess = false;
         }
-
-        return result;
+        return convertSuccess;
     }
 }

ruoyi-common/src/main/java/com/ruoyi/common/utils/JsonTest.java

@@ -0,0 +1,105 @@
+package com.ruoyi.common.utils;
+
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
+import org.springframework.http.HttpEntity;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+public class JsonTest {
+
+    /**
+     *
+     * @param httpArg :参数
+     * @return 返回结果
+     */
+
+    public static String request(String httpArg) {
+
+        String httpUrl = "http://www.easybots.cn/api/holiday.php";
+
+        BufferedReader reader = null;
+
+        String result = null;
+
+        StringBuffer sbf = new StringBuffer();
+
+        httpUrl = httpUrl + "?d=" + httpArg;
+
+        try {
+
+            URL url = new URL(httpUrl);
+
+            HttpURLConnection connection = (HttpURLConnection) url
+
+                    .openConnection();
+
+            connection.setRequestMethod("GET");
+
+            connection.connect();
+
+            InputStream is = connection.getInputStream();
+
+            reader = new BufferedReader(new InputStreamReader(is, "UTF-8"));
+
+            String strRead = null;
+
+            while ((strRead = reader.readLine()) != null) {
+
+                sbf.append(strRead);
+
+                sbf.append("\r\n");
+
+            }
+
+            reader.close();
+
+            result = sbf.toString();
+
+            Map map = JSONObject.parseObject(result);
+
+            String res = (String) map.get(httpArg);
+
+        } catch (Exception e) {
+
+            e.printStackTrace();
+
+        }
+
+        return result;
+
+    }
+
+    public static void main(String[] args) {
+
+//判断今天是否是工作日 周末 还是节假日
+
+        SimpleDateFormat f = new SimpleDateFormat("yyyyMMdd");
+
+        //String httpArg = f.format(new Date());
+        String httpArg = "20210101";
+        System.out.println(httpArg);
+
+        String jsonResult = request(httpArg);
+
+        Map map = JSONObject.parseObject(jsonResult);
+
+        String res = (String) map.get(httpArg);
+
+        System.out.println(res);
+
+        //0 上班 1周末 2节假日
+
+    }
+
+
+}

ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java

@@ -118,7 +118,7 @@ public class GenController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('tool:gen:edit')")
     @Log(title = "代码生成", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping("/put")
     public AjaxResult editSave(@Validated @RequestBody GenTable genTable)
     {
         genTableService.validateEdit(genTable);
@@ -131,7 +131,7 @@ public class GenController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('tool:gen:remove')")
     @Log(title = "代码生成", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{tableIds}")
+    @GetMapping("/delete/{tableIds}")
     public AjaxResult remove(@PathVariable Long[] tableIds)
     {
         genTableService.deleteGenTableByIds(tableIds);

ruoyi-system/src/main/java/com/ruoyi/system/domain/SysHoliday.java

@@ -0,0 +1,79 @@
+package com.ruoyi.system.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 节假日，需每年手动更新对象 sys_holiday
+ * 
+ * @author ruoyi
+ * @date 2023-03-04
+ */
+public class SysHoliday extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 年份 */
+    @Excel(name = "年份")
+    private String year;
+
+    /** 日期 (yyyy-MM-dd) */
+    @Excel(name = "日期 (yyyy-MM-dd)")
+    private String day;
+
+    /** 1:法律规定的放假日期， 2：由于放假需要额外工作的周末 */
+    @Excel(name = "1:法律规定的放假日期， 2：由于放假需要额外工作的周末")
+    private String type;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setYear(String year) 
+    {
+        this.year = year;
+    }
+
+    public String getYear() 
+    {
+        return year;
+    }
+    public void setDay(String day) 
+    {
+        this.day = day;
+    }
+
+    public String getDay() 
+    {
+        return day;
+    }
+    public void setType(String type) 
+    {
+        this.type = type;
+    }
+
+    public String getType() 
+    {
+        return type;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("year", getYear())
+            .append("day", getDay())
+            .append("type", getType())
+            .toString();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/projectV2/ZsyzJzqkTs.java

@@ -0,0 +1,137 @@
+package com.ruoyi.system.domain.projectV2;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 招商引资_进展情况_提示(当承接地已承接，但15天未填写签约信息的记录信息，前端给出提示框)对象 zsyz_jzqk_ts
+ * 
+ * @author ruoyi
+ * @date 2023-03-06
+ */
+public class ZsyzJzqkTs extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long id;
+
+    /** 项目ID */
+    @Excel(name = "项目ID")
+    private Long xmId;
+
+    /** 项目编号 */
+    @Excel(name = "项目编号")
+    private String xmbh;
+
+    /** 项目名称 */
+    @Excel(name = "项目名称")
+    private String xmmc;
+
+    /** 部门id */
+    @Excel(name = "部门id")
+    private Long deptId;
+
+    /** 部门名称 */
+    @Excel(name = "部门名称")
+    private String deptName;
+
+    /** 详情 */
+    @Excel(name = "详情")
+    private String details;
+
+    /** 是否删除 0：不删除 1：删除 */
+    private String isDel;
+
+    public String getIsDel() {
+        return isDel;
+    }
+
+    public void setIsDel(String isDel) {
+        this.isDel = isDel;
+    }
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setXmId(Long xmId) 
+    {
+        this.xmId = xmId;
+    }
+
+    public Long getXmId() 
+    {
+        return xmId;
+    }
+    public void setXmbh(String xmbh) 
+    {
+        this.xmbh = xmbh;
+    }
+
+    public String getXmbh() 
+    {
+        return xmbh;
+    }
+    public void setXmmc(String xmmc) 
+    {
+        this.xmmc = xmmc;
+    }
+
+    public String getXmmc() 
+    {
+        return xmmc;
+    }
+    public void setDeptId(Long deptId) 
+    {
+        this.deptId = deptId;
+    }
+
+    public Long getDeptId() 
+    {
+        return deptId;
+    }
+    public void setDeptName(String deptName) 
+    {
+        this.deptName = deptName;
+    }
+
+    public String getDeptName() 
+    {
+        return deptName;
+    }
+    public void setDetails(String details) 
+    {
+        this.details = details;
+    }
+
+    public String getDetails() 
+    {
+        return details;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("xmId", getXmId())
+            .append("xmbh", getXmbh())
+            .append("xmmc", getXmmc())
+            .append("deptId", getDeptId())
+            .append("deptName", getDeptName())
+            .append("details", getDetails())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/projectV2/ZsyzSbbzb.java

@@ -25,16 +25,16 @@ public class ZsyzSbbzb extends BaseEntity
     private Long id;
 
     /** 单位名称 */
-    //@Excel(name = "单位名称")
+    @Excel(name = "单位名称")
     private String sbdw;
 
     /** 填表日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    //@Excel(name = "填表日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "填表日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date tbrq;
 
     /** 项目负责人 */
-    //@Excel(name = "项目负责人")
+    @Excel(name = "项目负责人")
     private String zszxfzr;
 
     /** 项目线索名称 */
@@ -65,7 +65,7 @@ public class ZsyzSbbzb extends BaseEntity
     private String ntze;
 
     /** 产业类型id */
-    //@Excel(name = "产业类型id")
+    @Excel(name = "产业类型id")
     private String cylxId;
 
     /** 产业类型名称 */
@@ -85,7 +85,7 @@ public class ZsyzSbbzb extends BaseEntity
     private String nlhd;
 
     /** 承载平台 */
-    //@Excel(name = "承载平台")
+    @Excel(name = "承载平台")
     private String czpt;
 
     /** 投资主体 */
@@ -97,11 +97,11 @@ public class ZsyzSbbzb extends BaseEntity
     private String xmjz;
 
     /** 个体投资人身份证号码 */
-    //@Excel(name = "个体投资人身份证号码")
+    @Excel(name = "个体投资人身份证号码")
     private String gtzzrsfzhm;
 
     /** 企业投资人信用证代码 */
-   // @Excel(name = "企业投资人信用证代码")
+    @Excel(name = "企业投资人信用证代码")
     private String qytzrxyzdm;
 
     /** 企业背景（1：500强企业，2：上市公司，3：行业100强，4：头部企业，5：外资企业，6：民营企业，7：高新技术企业，8：其他） */
@@ -109,7 +109,7 @@ public class ZsyzSbbzb extends BaseEntity
     private String qybj;
 
     /** 投资方简介 */
-    //@Excel(name = "投资方简介")
+    @Excel(name = "投资方简介")
     private String tzfjj;
 
     /** 上年度销售额(万元) */
@@ -154,15 +154,15 @@ public class ZsyzSbbzb extends BaseEntity
     private String zw;
 
     /** 申请人用户ID */
-    //@Excel(name = "申请人用户ID")
+    @Excel(name = "申请人用户ID")
     private Long userId;
 
     /** 申报状态 1:正常 2:暂缓 */
-    //@Excel(name = "申报状态 1:正常 2:暂缓")
+    @Excel(name = "申报状态 1:正常 2:暂缓")
     private String type;
 
     /** 项目进度 1:项目首谈 2:项目承接 3:项目签约 4:项目开工 5:项目投产  */
-    //@Excel(name = "项目进度 1:项目首谈待审核 2:项目首谈已审核 3:线索分发要素部门 4:线索已指派 5:线索已承接 6:签约待审核 7:签约已审核 8:开工待审核 9:开工已审核 10:投产待审核 11:投产已审核 12:项目已入归")
+    @Excel(name = "项目进度 1=项目首谈待审核, 2=项目首谈已审核, 3=线索分发要素部门, 4=线索已指派, 5=线索已承接, 6=签约待审核, 7=签约已审核, 8=开工待审核, 9=开工已审核, 10=投产待审核, 11=投产已审核, 12=项目已入归")
     private String progress;
 
     /**
@@ -171,19 +171,19 @@ public class ZsyzSbbzb extends BaseEntity
     private String xmStatus;
 
     /** 申请人部门ID */
-   // @Excel(name = "申请人部门ID")
+    @Excel(name = "申请人部门ID")
     private Long deptId;
 
     /** 是否删除 N:否 Y:是 */
-    //@Excel(name = "是否删除 N:否 Y:是")
+    @Excel(name = "是否删除 N:否 Y:是")
     private String isDel;
 
     /** 承接地id */
-    //@Excel(name = "承接地id")
+    @Excel(name = "承接地id")
     private Long cjdId;
 
     /** 承接地部门名称 */
-    //@Excel(name = "承接地部门名称")
+    @Excel(name = "承接地部门名称")
     private String cjdName;
 
     /** 是否需要会议支持 N:否 Y:是 */
@@ -191,7 +191,7 @@ public class ZsyzSbbzb extends BaseEntity
     private String isMeet;
 
     /** 会议申请备注 */
-    //@Excel(name = "会议申请备注")
+    @Excel(name = "会议申请备注")
     private String meetRemark;
 
     /**

ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysHolidayMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import com.ruoyi.system.domain.SysHoliday;
+
+/**
+ * 节假日，需每年手动更新Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2023-03-04
+ */
+public interface SysHolidayMapper 
+{
+    /**
+     * 查询节假日，需每年手动更新
+     * 
+     * @param id 节假日，需每年手动更新主键
+     * @return 节假日，需每年手动更新
+     */
+    public SysHoliday selectSysHolidayById(Long id);
+
+    /**
+     * 查询节假日，需每年手动更新列表
+     * 
+     * @param sysHoliday 节假日，需每年手动更新
+     * @return 节假日，需每年手动更新集合
+     */
+    public List<SysHoliday> selectSysHolidayList(SysHoliday sysHoliday);
+
+    /**
+     * 新增节假日，需每年手动更新
+     * 
+     * @param sysHoliday 节假日，需每年手动更新
+     * @return 结果
+     */
+    public int insertSysHoliday(SysHoliday sysHoliday);
+
+    /**
+     * 修改节假日，需每年手动更新
+     * 
+     * @param sysHoliday 节假日，需每年手动更新
+     * @return 结果
+     */
+    public int updateSysHoliday(SysHoliday sysHoliday);
+
+    /**
+     * 删除节假日，需每年手动更新
+     * 
+     * @param id 节假日，需每年手动更新主键
+     * @return 结果
+     */
+    public int deleteSysHolidayById(Long id);
+
+    /**
+     * 批量删除节假日，需每年手动更新
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSysHolidayByIds(Long[] ids);
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/projectV2/ZsyzJzqkTsMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.system.mapper.projectV2;
+
+import java.util.List;
+import com.ruoyi.system.domain.projectV2.ZsyzJzqkTs;
+
+/**
+ * 招商引资_进展情况_提示(当承接地已承接，但15天未填写签约信息的记录信息，前端给出提示框)Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2023-03-06
+ */
+public interface ZsyzJzqkTsMapper 
+{
+    /**
+     * 查询招商引资_进展情况_提示(当承接地已承接，但15天未填写签约信息的记录信息，前端给出提示框)
+     * 
+     * @param id 招商引资_进展情况_提示(当承接地已承接，但15天未填写签约信息的记录信息，前端给出提示框)主键
+     * @return 招商引资_进展情况_提示(当承接地已承接，但15天未填写签约信息的记录信息，前端给出提示框)
+     */
+    public ZsyzJzqkTs selectZsyzJzqkTsById(Long id);
+
+    /**
+     * 查询招商引资_进展情况_提示(当承接地已承接，但15天未填写签约信息的记录信息，前端给出提示框)列表
+     * 
+     * @param zsyzJzqkTs 招商引资_进展情况_提示(当承接地已承接，但15天未填写签约信息的记录信息，前端给出提示框)
+     * @return 招商引资_进展情况_提示(当承接地已承接，但15天未填写签约信息的记录信息，前端给出提示框)集合
+     */
+    public List<ZsyzJzqkTs> selectZsyzJzqkTsList(ZsyzJzqkTs zsyzJzqkTs);
+
+    /**
+     * 新增招商引资_进展情况_提示(当承接地已承接，但15天未填写签约信息的记录信息，前端给出提示框)
+     * 
+     * @param zsyzJzqkTs 招商引资_进展情况_提示(当承接地已承接，但15天未填写签约信息的记录信息，前端给出提示框)
+     * @return 结果
+     */
+    public int insertZsyzJzqkTs(ZsyzJzqkTs zsyzJzqkTs);
+
+    /**
+     * 修改招商引资_进展情况_提示(当承接地已承接，但15天未填写签约信息的记录信息，前端给出提示框)
+     * 
+     * @param zsyzJzqkTs 招商引资_进展情况_提示(当承接地已承接，但15天未填写签约信息的记录信息，前端给出提示框)
+     * @return 结果
+     */
+    public int updateZsyzJzqkTs(ZsyzJzqkTs zsyzJzqkTs);
+
+    /**
+     * 删除招商引资_进展情况_提示(当承接地已承接，但15天未填写签约信息的记录信息，前端给出提示框)
+     * 
+     * @param id 招商引资_进展情况_提示(当承接地已承接，但15天未填写签约信息的记录信息，前端给出提示框)主键
+     * @return 结果
+     */
+    public int deleteZsyzJzqkTsById(Long id);
+
+    /**
+     * 批量删除招商引资_进展情况_提示(当承接地已承接，但15天未填写签约信息的记录信息，前端给出提示框)
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteZsyzJzqkTsByIds(Long[] ids);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysHolidayService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.system.service;
+
+import java.util.List;
+import com.ruoyi.system.domain.SysHoliday;
+
+/**
+ * 节假日，需每年手动更新Service接口
+ * 
+ * @author ruoyi
+ * @date 2023-03-04
+ */
+public interface ISysHolidayService 
+{
+    /**
+     * 查询节假日，需每年手动更新
+     * 
+     * @param id 节假日，需每年手动更新主键
+     * @return 节假日，需每年手动更新
+     */
+    public SysHoliday selectSysHolidayById(Long id);
+
+    /**
+     * 查询节假日，需每年手动更新列表
+     * 
+     * @param sysHoliday 节假日，需每年手动更新
+     * @return 节假日，需每年手动更新集合
+     */
+    public List<SysHoliday> selectSysHolidayList(SysHoliday sysHoliday);
+
+    /**
+     * 新增节假日，需每年手动更新
+     * 
+     * @param sysHoliday 节假日，需每年手动更新
+     * @return 结果
+     */
+    public int insertSysHoliday(SysHoliday sysHoliday);
+
+    /**
+     * 修改节假日，需每年手动更新
+     * 
+     * @param sysHoliday 节假日，需每年手动更新
+     * @return 结果
+     */
+    public int updateSysHoliday(SysHoliday sysHoliday);
+
+    /**
+     * 批量删除节假日，需每年手动更新
+     * 
+     * @param ids 需要删除的节假日，需每年手动更新主键集合
+     * @return 结果
+     */
+    public int deleteSysHolidayByIds(Long[] ids);
+
+    /**
+     * 删除节假日，需每年手动更新信息
+     * 
+     * @param id 节假日，需每年手动更新主键
+     * @return 结果
+     */
+    public int deleteSysHolidayById(Long id);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysHolidayServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ruoyi.system.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.system.mapper.SysHolidayMapper;
+import com.ruoyi.system.domain.SysHoliday;
+import com.ruoyi.system.service.ISysHolidayService;
+
+/**
+ * 节假日，需每年手动更新Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2023-03-04
+ */
+@Service
+public class SysHolidayServiceImpl implements ISysHolidayService 
+{
+    @Autowired
+    private SysHolidayMapper sysHolidayMapper;
+
+    /**
+     * 查询节假日，需每年手动更新
+     * 
+     * @param id 节假日，需每年手动更新主键
+     * @return 节假日，需每年手动更新
+     */
+    @Override
+    public SysHoliday selectSysHolidayById(Long id)
+    {
+        return sysHolidayMapper.selectSysHolidayById(id);
+    }
+
+    /**
+     * 查询节假日，需每年手动更新列表
+     * 
+     * @param sysHoliday 节假日，需每年手动更新
+     * @return 节假日，需每年手动更新
+     */
+    @Override
+    public List<SysHoliday> selectSysHolidayList(SysHoliday sysHoliday)
+    {
+        return sysHolidayMapper.selectSysHolidayList(sysHoliday);
+    }
+
+    /**
+     * 新增节假日，需每年手动更新
+     * 
+     * @param sysHoliday 节假日，需每年手动更新
+     * @return 结果
+     */
+    @Override
+    public int insertSysHoliday(SysHoliday sysHoliday)
+    {
+        return sysHolidayMapper.insertSysHoliday(sysHoliday);
+    }
+
+    /**
+     * 修改节假日，需每年手动更新
+     * 
+     * @param sysHoliday 节假日，需每年手动更新
+     * @return 结果
+     */
+    @Override
+    public int updateSysHoliday(SysHoliday sysHoliday)
+    {
+        return sysHolidayMapper.updateSysHoliday(sysHoliday);
+    }
+
+    /**
+     * 批量删除节假日，需每年手动更新
+     * 
+     * @param ids 需要删除的节假日，需每年手动更新主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSysHolidayByIds(Long[] ids)
+    {
+        return sysHolidayMapper.deleteSysHolidayByIds(ids);
+    }
+
+    /**
+     * 删除节假日，需每年手动更新信息
+     * 
+     * @param id 节假日，需每年手动更新主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSysHolidayById(Long id)
+    {
+        return sysHolidayMapper.deleteSysHolidayById(id);
+    }
+}

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

@@ -16,6 +16,8 @@ import org.springframework.stereotype.Service;
 import static com.ruoyi.common.constant.CommonConstants.FIV;
 import static com.ruoyi.common.constant.CommonConstants.FOR;
 
+import org.springframework.transaction.annotation.Transactional;
+
 /**
  * 招商引资_进展情况(跟督办关系 项目需要按照固定时间内,填写进展情况否则生成督办单)Service业务层处理
  * 
@@ -38,6 +40,7 @@ public class ZsyzJzqkServiceImpl implements IZsyzJzqkService
      * @return 招商引资_进展情况(跟督办关系 项目需要按照固定时间内,填写进展情况否则生成督办单)
      */
     @Override
+    @Transactional
     public ZsyzJzqk selectZsyzJzqkById(Long id)
     {
         ZsyzJzqk zsyzJzqk = zsyzJzqkMapper.selectZsyzJzqkById(id);
@@ -72,6 +75,7 @@ public class ZsyzJzqkServiceImpl implements IZsyzJzqkService
      * @return 结果
      */
     @Override
+    @Transactional
     public int insertZsyzJzqk(ZsyzJzqk zsyzJzqk)
     {
         SysUser user = SecurityUtils.getLoginUser().getUser();
@@ -100,6 +104,7 @@ public class ZsyzJzqkServiceImpl implements IZsyzJzqkService
      * @return 结果
      */
     @Override
+    @Transactional
     public int updateZsyzJzqk(ZsyzJzqk zsyzJzqk)
     {
         zsyzJzqk.setUpdateTime(DateUtils.getNowDate());

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

@@ -0,0 +1,96 @@
+package com.ruoyi.system.service.impl.projectV2;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.system.mapper.projectV2.ZsyzJzqkTsMapper;
+import com.ruoyi.system.domain.projectV2.ZsyzJzqkTs;
+import com.ruoyi.system.service.projectV2.IZsyzJzqkTsService;
+
+/**
+ * 招商引资_进展情况_提示(当承接地已承接，但15天未填写签约信息的记录信息，前端给出提示框)Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2023-03-06
+ */
+@Service
+public class ZsyzJzqkTsServiceImpl implements IZsyzJzqkTsService 
+{
+    @Autowired
+    private ZsyzJzqkTsMapper zsyzJzqkTsMapper;
+
+    /**
+     * 查询招商引资_进展情况_提示(当承接地已承接，但15天未填写签约信息的记录信息，前端给出提示框)
+     * 
+     * @param id 招商引资_进展情况_提示(当承接地已承接，但15天未填写签约信息的记录信息，前端给出提示框)主键
+     * @return 招商引资_进展情况_提示(当承接地已承接，但15天未填写签约信息的记录信息，前端给出提示框)
+     */
+    @Override
+    public ZsyzJzqkTs selectZsyzJzqkTsById(Long id)
+    {
+        return zsyzJzqkTsMapper.selectZsyzJzqkTsById(id);
+    }
+
+    /**
+     * 查询招商引资_进展情况_提示(当承接地已承接，但15天未填写签约信息的记录信息，前端给出提示框)列表
+     * 
+     * @param zsyzJzqkTs 招商引资_进展情况_提示(当承接地已承接，但15天未填写签约信息的记录信息，前端给出提示框)
+     * @return 招商引资_进展情况_提示(当承接地已承接，但15天未填写签约信息的记录信息，前端给出提示框)
+     */
+    @Override
+    public List<ZsyzJzqkTs> selectZsyzJzqkTsList(ZsyzJzqkTs zsyzJzqkTs)
+    {
+        return zsyzJzqkTsMapper.selectZsyzJzqkTsList(zsyzJzqkTs);
+    }
+
+    /**
+     * 新增招商引资_进展情况_提示(当承接地已承接，但15天未填写签约信息的记录信息，前端给出提示框)
+     * 
+     * @param zsyzJzqkTs 招商引资_进展情况_提示(当承接地已承接，但15天未填写签约信息的记录信息，前端给出提示框)
+     * @return 结果
+     */
+    @Override
+    public int insertZsyzJzqkTs(ZsyzJzqkTs zsyzJzqkTs)
+    {
+        zsyzJzqkTs.setCreateTime(DateUtils.getNowDate());
+        return zsyzJzqkTsMapper.insertZsyzJzqkTs(zsyzJzqkTs);
+    }
+
+    /**
+     * 修改招商引资_进展情况_提示(当承接地已承接，但15天未填写签约信息的记录信息，前端给出提示框)
+     * 
+     * @param zsyzJzqkTs 招商引资_进展情况_提示(当承接地已承接，但15天未填写签约信息的记录信息，前端给出提示框)
+     * @return 结果
+     */
+    @Override
+    public int updateZsyzJzqkTs(ZsyzJzqkTs zsyzJzqkTs)
+    {
+        zsyzJzqkTs.setUpdateTime(DateUtils.getNowDate());
+        return zsyzJzqkTsMapper.updateZsyzJzqkTs(zsyzJzqkTs);
+    }
+
+    /**
+     * 批量删除招商引资_进展情况_提示(当承接地已承接，但15天未填写签约信息的记录信息，前端给出提示框)
+     * 
+     * @param ids 需要删除的招商引资_进展情况_提示(当承接地已承接，但15天未填写签约信息的记录信息，前端给出提示框)主键
+     * @return 结果
+     */
+    @Override
+    public int deleteZsyzJzqkTsByIds(Long[] ids)
+    {
+        return zsyzJzqkTsMapper.deleteZsyzJzqkTsByIds(ids);
+    }
+
+    /**
+     * 删除招商引资_进展情况_提示(当承接地已承接，但15天未填写签约信息的记录信息，前端给出提示框)信息
+     * 
+     * @param id 招商引资_进展情况_提示(当承接地已承接，但15天未填写签约信息的记录信息，前端给出提示框)主键
+     * @return 结果
+     */
+    @Override
+    public int deleteZsyzJzqkTsById(Long id)
+    {
+        return zsyzJzqkTsMapper.deleteZsyzJzqkTsById(id);
+    }
+}

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

@@ -173,10 +173,12 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
                         // 全部同意 项目进入承接已审核
                         zsyzSbbzb.setProgress(TWO);
                         zsyzSbbzb.setXmStatus(TWO);
+                        zsyzSbbzb.setUpdateTime(DateUtils.getNowDate());
                     } else {
                         //说明都回复过 没有都同意 项目回到 项目首谈已审核,清空承接地信息
                         zsyzSbbzb.setProgress(ONE);
                         zsyzSbbzb.setXmStatus(THR);
+                        zsyzSbbzb.setUpdateTime(DateUtils.getNowDate());
                     }
                 }
             }
@@ -185,6 +187,7 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
             //驳回
             zsyzSbbzb.setXmStatus(THR);
             zsyzSbbzb.setShjg(TWO);
+            zsyzSbbzb.setUpdateTime(DateUtils.getNowDate());
             //需要去中间表zsyz_project_dept判断要素部门是否都回复过
             if (zsyzProjectDeptsYsbm != null) {
                 Map<String, List<ZsyzProjectDept>> collect = zsyzProjectDeptsYsbm.stream().collect(Collectors.groupingBy(ZsyzProjectDept::getIsHf));
@@ -193,6 +196,7 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
                     //说明都回复过 项目回到 项目首谈已审核,清空承接地信息
                     zsyzSbbzb.setProgress(ONE);
                     zsyzSbbzb.setXmStatus(TWO);
+                    zsyzSbbzb.setUpdateTime(DateUtils.getNowDate());
                 }
             }
         }

ruoyi-system/src/main/java/com/ruoyi/system/service/projectV2/IZsyzJzqkTsService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.system.service.projectV2;
+
+import java.util.List;
+import com.ruoyi.system.domain.projectV2.ZsyzJzqkTs;
+
+/**
+ * 招商引资_进展情况_提示(当承接地已承接，但15天未填写签约信息的记录信息，前端给出提示框)Service接口
+ * 
+ * @author ruoyi
+ * @date 2023-03-06
+ */
+public interface IZsyzJzqkTsService 
+{
+    /**
+     * 查询招商引资_进展情况_提示(当承接地已承接，但15天未填写签约信息的记录信息，前端给出提示框)
+     * 
+     * @param id 招商引资_进展情况_提示(当承接地已承接，但15天未填写签约信息的记录信息，前端给出提示框)主键
+     * @return 招商引资_进展情况_提示(当承接地已承接，但15天未填写签约信息的记录信息，前端给出提示框)
+     */
+    public ZsyzJzqkTs selectZsyzJzqkTsById(Long id);
+
+    /**
+     * 查询招商引资_进展情况_提示(当承接地已承接，但15天未填写签约信息的记录信息，前端给出提示框)列表
+     * 
+     * @param zsyzJzqkTs 招商引资_进展情况_提示(当承接地已承接，但15天未填写签约信息的记录信息，前端给出提示框)
+     * @return 招商引资_进展情况_提示(当承接地已承接，但15天未填写签约信息的记录信息，前端给出提示框)集合
+     */
+    public List<ZsyzJzqkTs> selectZsyzJzqkTsList(ZsyzJzqkTs zsyzJzqkTs);
+
+    /**
+     * 新增招商引资_进展情况_提示(当承接地已承接，但15天未填写签约信息的记录信息，前端给出提示框)
+     * 
+     * @param zsyzJzqkTs 招商引资_进展情况_提示(当承接地已承接，但15天未填写签约信息的记录信息，前端给出提示框)
+     * @return 结果
+     */
+    public int insertZsyzJzqkTs(ZsyzJzqkTs zsyzJzqkTs);
+
+    /**
+     * 修改招商引资_进展情况_提示(当承接地已承接，但15天未填写签约信息的记录信息，前端给出提示框)
+     * 
+     * @param zsyzJzqkTs 招商引资_进展情况_提示(当承接地已承接，但15天未填写签约信息的记录信息，前端给出提示框)
+     * @return 结果
+     */
+    public int updateZsyzJzqkTs(ZsyzJzqkTs zsyzJzqkTs);
+
+    /**
+     * 批量删除招商引资_进展情况_提示(当承接地已承接，但15天未填写签约信息的记录信息，前端给出提示框)
+     * 
+     * @param ids 需要删除的招商引资_进展情况_提示(当承接地已承接，但15天未填写签约信息的记录信息，前端给出提示框)主键集合
+     * @return 结果
+     */
+    public int deleteZsyzJzqkTsByIds(Long[] ids);
+
+    /**
+     * 删除招商引资_进展情况_提示(当承接地已承接，但15天未填写签约信息的记录信息，前端给出提示框)信息
+     * 
+     * @param id 招商引资_进展情况_提示(当承接地已承接，但15天未填写签约信息的记录信息，前端给出提示框)主键
+     * @return 结果
+     */
+    public int deleteZsyzJzqkTsById(Long id);
+}

ruoyi-system/src/main/resources/mapper/system/SysHolidayMapper.xml

@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper.SysHolidayMapper">
+    
+    <resultMap type="SysHoliday" id="SysHolidayResult">
+        <result property="id"    column="id"    />
+        <result property="year"    column="year"    />
+        <result property="day"    column="day"    />
+        <result property="type"    column="type"    />
+    </resultMap>
+
+    <sql id="selectSysHolidayVo">
+        select id, year, day, type from sys_holiday
+    </sql>
+
+    <select id="selectSysHolidayList" parameterType="SysHoliday" resultMap="SysHolidayResult">
+        <include refid="selectSysHolidayVo"/>
+        <where>  
+            <if test="year != null  and year != ''"> and year = #{year}</if>
+            <if test="day != null  and day != ''"> and day = #{day}</if>
+            <if test="type != null  and type != ''"> and type = #{type}</if>
+        </where>
+    </select>
+    
+    <select id="selectSysHolidayById" parameterType="Long" resultMap="SysHolidayResult">
+        <include refid="selectSysHolidayVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertSysHoliday" parameterType="SysHoliday">
+        insert into sys_holiday
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="year != null">year,</if>
+            <if test="day != null">day,</if>
+            <if test="type != null">type,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="year != null">#{year},</if>
+            <if test="day != null">#{day},</if>
+            <if test="type != null">#{type},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSysHoliday" parameterType="SysHoliday">
+        update sys_holiday
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="year != null">year = #{year},</if>
+            <if test="day != null">day = #{day},</if>
+            <if test="type != null">type = #{type},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteSysHolidayById" parameterType="Long">
+        delete from sys_holiday where id = #{id}
+    </delete>
+
+    <delete id="deleteSysHolidayByIds" parameterType="String">
+        delete from sys_holiday where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper.projectV2.ZsyzJzqkTsMapper">
+    
+    <resultMap type="ZsyzJzqkTs" id="ZsyzJzqkTsResult">
+        <result property="id"    column="id"    />
+        <result property="xmId"    column="xm_id"    />
+        <result property="xmbh"    column="xmbh"    />
+        <result property="xmmc"    column="xmmc"    />
+        <result property="deptId"    column="dept_id"    />
+        <result property="deptName"    column="dept_name"    />
+        <result property="details"    column="details"    />
+        <result property="isDel"    column="is_del"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectZsyzJzqkTsVo">
+        select id, xm_id, xmbh, xmmc, dept_id, dept_name, details, create_by, create_time, update_by, update_time, remark from zsyz_jzqk_ts
+    </sql>
+
+    <select id="selectZsyzJzqkTsList" parameterType="ZsyzJzqkTs" resultMap="ZsyzJzqkTsResult">
+        <include refid="selectZsyzJzqkTsVo"/>
+        <where>  
+            <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="deptId != null "> and dept_id = #{deptId}</if>
+            <if test="deptName != null  and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if>
+            <if test="details != null  and details != ''"> and details = #{details}</if>
+            <if test="isDel != null  and isDel != ''"> and is_del = #{isDel}</if>
+        </where>
+    </select>
+    
+    <select id="selectZsyzJzqkTsById" parameterType="Long" resultMap="ZsyzJzqkTsResult">
+        <include refid="selectZsyzJzqkTsVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertZsyzJzqkTs" parameterType="ZsyzJzqkTs" useGeneratedKeys="true" keyProperty="id">
+        insert into zsyz_jzqk_ts
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="xmId != null">xm_id,</if>
+            <if test="xmbh != null">xmbh,</if>
+            <if test="xmmc != null and xmmc != ''">xmmc,</if>
+            <if test="deptId != null">dept_id,</if>
+            <if test="deptName != null and deptName != ''">dept_name,</if>
+            <if test="details != null">details,</if>
+            <if test="isDel != null">is_del,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="xmId != null">#{xmId},</if>
+            <if test="xmbh != null">#{xmbh},</if>
+            <if test="xmmc != null and xmmc != ''">#{xmmc},</if>
+            <if test="deptId != null">#{deptId},</if>
+            <if test="deptName != null and deptName != ''">#{deptName},</if>
+            <if test="details != null">#{details},</if>
+            <if test="isDel != null">#{isDel},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateZsyzJzqkTs" parameterType="ZsyzJzqkTs">
+        update zsyz_jzqk_ts
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="xmId != null">xm_id = #{xmId},</if>
+            <if test="xmbh != null">xmbh = #{xmbh},</if>
+            <if test="xmmc != null and xmmc != ''">xmmc = #{xmmc},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="deptName != null and deptName != ''">dept_name = #{deptName},</if>
+            <if test="details != null">details = #{details},</if>
+            <if test="isDel != null">is_del = #{isDel},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteZsyzJzqkTsById" parameterType="Long">
+        delete from zsyz_jzqk_ts where id = #{id}
+    </delete>
+
+    <delete id="deleteZsyzJzqkTsByIds" parameterType="String">
+        delete from zsyz_jzqk_ts where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>