节点流程

ruoyi-admin/src/main/java/com/ruoyi/web/controller/fgw/FgwXmsbController.java

@@ -124,7 +124,7 @@ public class FgwXmsbController extends BaseController
     @PostMapping("/put")
     public AjaxResult edit(@RequestBody FgwXmsb fgwXmsb)
     {
-        return toAjax(fgwXmsbService.updateFgwXmsb(fgwXmsb));
+        return fgwXmsbService.updateFgwXmsb(fgwXmsb);
     }
 
     /**

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

@@ -17,11 +17,10 @@ import org.apache.commons.lang3.time.DateFormatUtils;
 
 /**
  * 时间工具类
- * 
+ *
  * @author ruoyi
  */
-public class DateUtils extends org.apache.commons.lang3.time.DateUtils
-{
+public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
     public static String YYYY = "yyyy";
 
     public static String YYYY_MM = "yyyy-MM";
@@ -33,73 +32,60 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     public static String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss";
 
     private static String[] parsePatterns = {
-            "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM", 
+            "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM",
             "yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM",
             "yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM"};
 
     /**
      * 获取当前Date型日期
-     * 
+     *
      * @return Date() 当前日期
      */
-    public static Date getNowDate()
-    {
+    public static Date getNowDate() {
         return new Date();
     }
 
     /**
      * 获取当前日期, 默认格式为yyyy-MM-dd
-     * 
+     *
      * @return String
      */
-    public static String getDate()
-    {
+    public static String getDate() {
         return dateTimeNow(YYYY_MM_DD);
     }
 
-    public static final String getTime()
-    {
+    public static final String getTime() {
         return dateTimeNow(YYYY_MM_DD_HH_MM_SS);
     }
 
-    public static final String getYear()
-    {
+    public static final String getYear() {
         return dateTimeNow(YYYY);
     }
 
-    public static final String getYearMonth()
-    {
+    public static final String getYearMonth() {
         return dateTimeNow(YYYY_MM);
     }
 
-    public static final String dateTimeNow()
-    {
+    public static final String dateTimeNow() {
         return dateTimeNow(YYYYMMDDHHMMSS);
     }
 
-    public static final String dateTimeNow(final String format)
-    {
+    public static final String dateTimeNow(final String format) {
         return parseDateToStr(format, new Date());
     }
 
-    public static final String dateTime(final Date date)
-    {
+    public static final String dateTime(final Date date) {
         return parseDateToStr(YYYY_MM_DD, date);
     }
 
-    public static final String parseDateToStr(final String format, final Date date)
-    {
+    public static final String parseDateToStr(final String format, final Date date) {
         return new SimpleDateFormat(format).format(date);
     }
 
-    public static final Date dateTime(final String format, final String ts)
-    {
-        try
-        {
+    public static final Date dateTime(final String format, final String ts) {
+        try {
             return new SimpleDateFormat(format).parse(ts);
-        }
-        catch (ParseException e)
-        {
+        } catch (ParseException e) {
             throw new RuntimeException(e);
         }
     }
@@ -107,8 +93,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     /**
      * 日期路径 即年/月/日 如2018/08/08
      */
-    public static final String datePath()
-    {
+    public static final String datePath() {
         Date now = new Date();
         return DateFormatUtils.format(now, "yyyy/MM/dd");
     }
@@ -116,8 +101,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     /**
      * 日期路径 即年/月/日 如20180808
      */
-    public static final String dateTime()
-    {
+    public static final String dateTime() {
         Date now = new Date();
         return DateFormatUtils.format(now, "yyyyMMdd");
     }
@@ -125,27 +109,33 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     /**
      * 日期型字符串转化为日期 格式
      */
-    public static Date parseDate(Object str)
-    {
-        if (str == null)
-        {
+    public static Date parseDate(Object str) {
+        if (str == null) {
             return null;
         }
-        try
-        {
+        try {
             return parseDate(str.toString(), parsePatterns);
-        }
-        catch (ParseException e)
-        {
+        } catch (ParseException e) {
             return null;
         }
     }
 
+    /**
+     * 将长时间格式时间转换为字符串 yyyy-MM-dd HH:mm:ss
+     *
+     * @param dateDate
+     * @return
+     */
+    public static String dateToStrLong(Date dateDate,String format) {
+        SimpleDateFormat formatter = new SimpleDateFormat(format);
+        String dateString = formatter.format(dateDate);
+        return dateString;
+    }
+
     /**
      * 获取服务器启动时间
      */
-    public static Date getServerStartDate()
-    {
+    public static Date getServerStartDate() {
         long time = ManagementFactory.getRuntimeMXBean().getStartTime();
         return new Date(time);
     }
@@ -153,20 +143,18 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     /**
      * 计算相差天数
      */
-    public static int differentDaysByMillisecond(Date date1, Date date2)
-    {
+    public static int differentDaysByMillisecond(Date date1, Date date2) {
         return Math.abs((int) ((date2.getTime() - date1.getTime()) / (1000 * 3600 * 24)));
     }
 
     /**
      * 计算时间差
      *
-     * @param endDate 最后时间
+     * @param endDate   最后时间
      * @param startTime 开始时间
      * @return 时间差（天/小时/分钟）
      */
-    public static String timeDistance(Date endDate, Date startTime)
-    {
+    public static String timeDistance(Date endDate, Date startTime) {
         long nd = 1000 * 24 * 60 * 60;
         long nh = 1000 * 60 * 60;
         long nm = 1000 * 60;
@@ -186,6 +174,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
 
     /**
      * 获取两个日期间的天数，精确到年月日
+     *
      * @param starts
      * @param ends
      * @return
@@ -210,8 +199,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     /**
      * 增加 LocalDateTime ==> Date
      */
-    public static Date toDate(LocalDateTime temporalAccessor)
-    {
+    public static Date toDate(LocalDateTime temporalAccessor) {
         ZonedDateTime zdt = temporalAccessor.atZone(ZoneId.systemDefault());
         return Date.from(zdt.toInstant());
     }
@@ -219,8 +207,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     /**
      * 增加 LocalDate ==> Date
      */
-    public static Date toDate(LocalDate temporalAccessor)
-    {
+    public static Date toDate(LocalDate temporalAccessor) {
         LocalDateTime localDateTime = LocalDateTime.of(temporalAccessor, LocalTime.of(0, 0, 0));
         ZonedDateTime zdt = localDateTime.atZone(ZoneId.systemDefault());
         return Date.from(zdt.toInstant());
@@ -229,8 +216,8 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     /**
      * 计算两个日期之间的工作日天数，包含起始日期，包含终止日期
      *
-     * @param start  计算开始时间  必须传yyyy-MM-dd的格式
-     * @param stop	计算结束时间  必须传yyyy-MM-dd的格式
+     * @param start 计算开始时间  必须传yyyy-MM-dd的格式
+     * @param stop  计算结束时间  必须传yyyy-MM-dd的格式
      * @return
      * @throws ParseException
      */
@@ -241,8 +228,8 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
         Calendar cEnd = new GregorianCalendar();
         cEnd.setTime(endTime);
         // 计算时算入stop当天
-        cEnd.add(Calendar.DATE,1);
-        Date end=cEnd.getTime();
+        cEnd.add(Calendar.DATE, 1);
+        Date end = cEnd.getTime();
         //
         Calendar c = Calendar.getInstance();
         c.setTime(begin);
@@ -251,7 +238,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
         while (c.getTime().before(end)) {
             ymd = DateFormatUtils.format(c.getTime(), pattern);
             //
-            if (HolidayUtils.isHoliday(ymd,lawHolidays,extraWorkdays)) {
+            if (HolidayUtils.isHoliday(ymd, lawHolidays, extraWorkdays)) {
                 count++;
             }
             c.add(Calendar.DATE, 1);

ruoyi-system/src/main/java/com/ruoyi/system/service/fgw/IFgwXmsbService.java

@@ -45,7 +45,7 @@ public interface IFgwXmsbService
      * @param fgwXmsb 发改委_申报_主
      * @return 结果
      */
-    public int updateFgwXmsb(FgwXmsb fgwXmsb);
+    public AjaxResult updateFgwXmsb(FgwXmsb fgwXmsb);
 
     /**
      * 批量删除发改委_申报_主

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

@@ -106,7 +106,20 @@ public class FgwXmsbServiceImpl implements IFgwXmsbService {
      * @return 结果
      */
     @Override
-    public int updateFgwXmsb(FgwXmsb fgwXmsb) {
+    public AjaxResult updateFgwXmsb(FgwXmsb fgwXmsb) {
+
+        //判断是否填写节点安排
+        FgwXmsb xmsb = fgwXmsbMapper.selectFgwXmsbById(fgwXmsb.getId());
+        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("上传失败，节点安排信息未完善或节点安排信息审核未通过！");
+        }
+
         fgwXmsb.setUpdateTime(DateUtils.getNowDate());
         String progress = fgwXmsb.getProgress();
         String status = fgwXmsb.getStatus();
@@ -128,7 +141,8 @@ public class FgwXmsbServiceImpl implements IFgwXmsbService {
                 }
             }
         }
-        return fgwXmsbMapper.updateFgwXmsb(fgwXmsb);
+        int rows = fgwXmsbMapper.updateFgwXmsb(fgwXmsb);
+        return rows > 0 ? AjaxResult.success() : AjaxResult.error();
     }
 
     /**