消息通知bugfix

ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/BasicInformationController.java

@@ -63,6 +63,12 @@ public class BasicInformationController extends BaseController {
     @Resource
     private MxService mxService;
 
+    /**
+     * 消息通知
+     */
+    @Resource
+    private NoticeService noticeService;
+
     /**
      * 五要素模型信息
      */
@@ -188,6 +194,13 @@ public class BasicInformationController extends BaseController {
                     projectOtherInfo.setZdname(y);
                     saveOther.add(projectOtherInfo);
                 });
+                //新增消息
+                Notice notice = new Notice();
+                notice.setType(2);
+                notice.setTyshxydm(x.getTyshxydm());
+                notice.setXmId(x.getId());
+                notice.setContent("关于"+x.getName()+"项目,待填报的通知");
+                noticeService.save(notice);
             });
             successMsg.append("导入成功");
         }

ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/QyStatsController.java

@@ -23,7 +23,7 @@ import javax.annotation.Resource;
 @Api(tags = "企业统计")
 @RestController
 @RequestMapping("/gysl/qyStats")
-@PreAuthorize("@ss.hasAnyRoles('company')")
+//@PreAuthorize("@ss.hasAnyRoles('company')")
 public class QyStatsController extends BaseController {
 
     @Resource
@@ -55,5 +55,14 @@ public class QyStatsController extends BaseController {
     public AjaxResult qyNotice() {
         return success(qyStatsService.qyNotice(SecurityUtils.getUsername()));
     }
+
+    /**
+     * 企业消息通知数量
+     */
+    @ApiOperation("企业消息通知数量")
+    @GetMapping("/qyNoticeCount")
+    public AjaxResult qyNoticeCount() {
+        return success(qyStatsService.qyNoticeCount(SecurityUtils.getUsername()));
+    }
 }
 

ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ZwStatsController.java

@@ -79,5 +79,15 @@ public class ZwStatsController extends BaseController {
     public AjaxResult zwNotice() {
         return success(zwStatsService.zwNotice());
     }
+
+
+    /**
+     * 政务消息通知数量
+     */
+    @ApiOperation("政务消息通知数量")
+    @GetMapping("/zwNoticeCount")
+    public AjaxResult zwNoticeCount() {
+        return success(zwStatsService.zwNoticeCount());
+    }
 }
 

ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BasicInformation.java

@@ -32,13 +32,13 @@ public class BasicInformation extends BaseModel {
     private Long id;
 
 
-    @Excel(name = "统一社会信用代码", sort = 2)
+    @Excel(name = "统一社会信用代码", sort = 2,required = true)
     @ApiModelProperty("统一社会信用代码")
     private String tyshxydm;
 
 
     @NotBlank
-    @Excel(name = "项目名称", sort = 2)
+    @Excel(name = "项目名称", sort = 2,required = true)
     @ApiModelProperty("项目名称")
     private String name;
 

ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Notice.java

@@ -47,6 +47,6 @@ public class Notice implements Serializable {
     private LocalDateTime createTime;
 
     @ApiModelProperty(value = "项目id")
-    private Long zwId;
+    private Long xmId;
 }
 

ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/QyStatsMapper.java

@@ -29,5 +29,10 @@ public interface QyStatsMapper {
      * 消息通知
      */
     List<Notice> qyNotice(@Param("username") String username);
+
+    /**
+     * 企业消息通知数量
+     */
+    int qyNoticeCount(String username);
 }
 

ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/ZwStatsMapper.java

@@ -32,5 +32,10 @@ public interface ZwStatsMapper {
      * 消息通知
      */
     List<Notice> zwNotice();
+
+    /**
+     * 政务消息通知数量
+     */
+    int zwNoticeCount();
 }
 

ruoyi-admin/src/main/java/com/ruoyi/gysl/service/QyStatsService.java

@@ -30,5 +30,10 @@ public interface QyStatsService {
      * 消息通知
      */
     List<Notice> qyNotice(String username);
+
+    /**
+     * 企业消息通知数量
+     */
+    int qyNoticeCount(String username);
 }
 

ruoyi-admin/src/main/java/com/ruoyi/gysl/service/ZwStatsService.java

@@ -34,5 +34,10 @@ public interface ZwStatsService {
      * 消息通知
      */
     List<Notice> zwNotice();
+
+    /**
+     * 政务消息通知数量
+     */
+    int zwNoticeCount();
 }
 

ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/BasicInformationServiceImpl.java

@@ -74,7 +74,11 @@ public class BasicInformationServiceImpl extends ServiceImpl<BasicInformationMap
      */
     @Resource
     private ProjectRemarkService projectRemarkService;
-
+    /**
+     * 消息通知
+     */
+    @Resource
+    private NoticeService noticeService;
     /**
      * 月度进展信息
      */
@@ -283,6 +287,21 @@ public class BasicInformationServiceImpl extends ServiceImpl<BasicInformationMap
                 .eq(ProjectOtherInfo::getXmId, req.getBasicInformation().getId())
                 .remove();
         otherInfoService.saveBatch(req.getProjectOtherInfos());
+        Notice one = noticeService.lambdaQuery().eq(Notice::getXmId, req.getBasicInformation().getId()).one();
+
+        if(status == 2){
+            //修改消息
+            one.setType(1);
+            one.setContent("关于"+req.getBasicInformation().getId()+"项目,待审核的通知");
+            noticeService.updateById(one);
+        }
+        if(status == 3){
+            //修改消息
+            one.setType(2);
+            one.setContent("关于"+req.getBasicInformation().getId()+"项目,审核通过的通知");
+            noticeService.updateById(one);
+        }
+
         return req.getBasicInformation().getId();
     }
 

ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/QyStatsServiceImpl.java

@@ -49,4 +49,12 @@ public class QyStatsServiceImpl implements QyStatsService {
         return qyStatsMapper.qyNotice(username);
     }
 
+    /**
+     * 企业消息通知数量
+     */
+    @Override
+    public int qyNoticeCount(String username) {
+        return qyStatsMapper.qyNoticeCount(username);
+    }
+
 }

ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/ZwStatsServiceImpl.java

@@ -52,4 +52,12 @@ public class ZwStatsServiceImpl implements ZwStatsService {
     public List<Notice> zwNotice() {
         return zwStatsMapper.zwNotice();
     }
+
+    /**
+     * 政务消息通知数量
+     */
+    @Override
+    public int zwNoticeCount() {
+        return zwStatsMapper.zwNoticeCount();
+    }
 }

ruoyi-admin/src/main/resources/mapper/QyStatsMapper.xml

@@ -33,5 +33,9 @@
          select * from notice
          where tyshxydm = #{username} and type = 2
     </select>
+    <select id="qyNoticeCount" resultType="java.lang.Integer">
+        select count(*) from notice
+        where tyshxydm = #{username} and type = 2
+    </select>
 </mapper>
 

ruoyi-admin/src/main/resources/mapper/ZwStatsMapper.xml

@@ -41,7 +41,11 @@
     </select>
     <select id="zwNotice" resultType="com.ruoyi.gysl.entity.Notice">
         select * from notice
-        where  type = 2
+        where  type = 1
+    </select>
+    <select id="zwNoticeCount" resultType="java.lang.Integer">
+        select count(*) from notice
+        where  type = 1
     </select>
 </mapper>
 

ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java

@@ -18,6 +18,11 @@ import com.ruoyi.common.utils.poi.ExcelHandlerAdapter;
 @Target(ElementType.FIELD)
 public @interface Excel
 {
+    /**
+     * 判断是否必填项
+     */
+    public boolean required() default false;
+
     /**
      * 导出时在excel中排序
      */

ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java

@@ -24,6 +24,8 @@ import java.util.Set;
 import java.util.UUID;
 import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.exception.ServiceException;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.RegExUtils;
 import org.apache.commons.lang3.reflect.FieldUtils;
@@ -421,6 +423,12 @@ public class ExcelUtil<T>
                     // 从map中得到对应列的field.
                     Field field = (Field) entry.getValue()[0];
                     Excel attr = (Excel) entry.getValue()[1];
+                    boolean rq = attr.required();
+                    if(rq){
+                        if(StringUtils.isNull(val) || StringUtils.isEmpty(val.toString())) {
+                            throw new ServiceException("第"+i+"行"+attr.name()+"单元格必填项未填写,请正确填写!");
+                        }
+                    }
                     // 取得类型,并根据对象类型设置值.
                     Class<?> fieldType = field.getType();
                     if (String.class == fieldType)