bug修复

src/main/java/com/keymobile/indicators/api/hytobacco/NoticeInfoCtrl.java

@@ -30,10 +30,10 @@ public class NoticeInfoCtrl {
     public Page<NoticeInfo> find(@ApiParam("关键字搜索（标题）") @RequestParam(value = "keyword", required = false) String keyword,
                                  @ApiParam("页码，从1开始") @RequestParam("pageNo") int pageNo,
                                  @ApiParam("每页条数") @RequestParam("pageSize") int pageSize) {
-        PageRequest request = PageRequest.of(pageNo, pageSize);
+        PageRequest request = PageRequest.of(pageNo-1, pageSize);
         List<NoticeInfo> list = new ArrayList<>();
-        String currentUserId = SystemUserUtil.getCurrentUserId();
-        System.out.println(currentUserId);
+       // String currentUserId = SystemUserUtil.getCurrentUserId();
+       // System.out.println(currentUserId);
         long total = noticeInfoService.findByPageCount(keyword, null, SystemUserUtil.getCurrentUserId());
         if (total > 0) {
             list = noticeInfoService.findByPage(keyword, null, SystemUserUtil.getCurrentUserId(), request.getOffset(), pageSize);

src/main/java/com/keymobile/indicators/service/dataenter/impl/TaskServiceImpl.java

@@ -407,17 +407,19 @@ public class TaskServiceImpl implements TaskService {
         if(status==Constants.APPLY_STATE_DRAFT){
             String user = SystemUserUtil.getCurrentUser();
             String enterUserStr = task.getEnterUsers();
+            System.out.println("enterUserStr:"+enterUserStr);
             if(StringUtils.isNotBlank(enterUserStr)){
                 List<NoticeInfo> noticeInfos = new ArrayList<>();
                 String[] enterUsers = enterUserStr.split(Constants.SEP_COMMA);
                 //enterUserStr = ,42, 所以要忽略数组前后值
-                for(int i=1;i<enterUsers.length-1;i++){
+                boolean isUser=false;
+                for(int i=1;i<enterUsers.length;i++){
                     NoticeInfo noticeInfo = new NoticeInfo();
                     noticeInfo.setTaskId(task.getId());
                     noticeInfo.setNoticeClass(Constants.NOTICEINFO_DATA_ENTER);
                     noticeInfo.setCreateTime(now);
                     noticeInfo.setCreator(user);
-                    noticeInfo.setDetail(task.getRuleName() + "-任务已经被"+auditUser+"驳回");
+                    noticeInfo.setDetail(task.getRuleName() + "-任务已经被"+auditUser+"驳回，请重新填报。");
                     noticeInfo.setTitle("你有被驳回的任务：" + task.getRuleName() );
                     noticeInfo.setToUserId(enterUsers[i]);
                     noticeInfo.setIsRead(false);
@@ -425,8 +427,12 @@ public class TaskServiceImpl implements TaskService {
                     noticeInfo.setUpdater(user);
                     noticeInfo.setUpdateTime(now);
                     noticeInfos.add(noticeInfo);
+                    isUser= true;
+                }
+                if(isUser){
+
+                    noticeInfoService.createNotices(noticeInfos);
                 }
-                noticeInfoService.createNotices(noticeInfos);
             }
         }
 

src/main/resources/mybatis/mapping/NoticeInfoMapper.xml

@@ -3,13 +3,11 @@
 <mapper namespace="com.keymobile.indicators.model.mapper.indicators.NoticeInfoMapper">
     <insert id="batchInsert" parameterType="list">
         insert into notice_info
-        (title, detail, is_read, to_user,state,
-        creator,updater,create_time,update_time)
+        (title, detail, is_read, to_user,state,creator,updater,create_time,update_time,task_id,notice_class,url)
         values
         <foreach collection="notices" item="nt" separator=",">
             (
-              #{nt.title}, #{nt.detail}, #{nt.isRead}, #{nt.toUserId}, #{nt.state},
-            #{nt.creator},#{nt.updater}, #{nt.createTime}, #{nt.updateTime}
+            #{nt.title}, #{nt.detail}, #{nt.isRead}, #{nt.toUserId}, #{nt.state},#{nt.creator},#{nt.updater}, #{nt.createTime}, #{nt.updateTime},#{nt.taskId},#{nt.noticeClass},#{nt.url}
             )
         </foreach>
     </insert>