update

src/main/java/com/ydool/boot/modules/rddb/entity/Appoint.java

@@ -46,8 +46,13 @@ public class Appoint extends BaseEntity {
     /**
      * 测评对象
      */
-    @ApiModelProperty(value = "admin机关办公/ rddb代表/ voter选民  多个用英文逗号间隔")
+    @ApiModelProperty(value = "流程三专用  admin机关办公/ rddb代表/ voter选民  多个用英文逗号间隔")
     private String obj;
+    /**
+     * 测评对象
+     */
+    @ApiModelProperty(value = "流程五专用  admin机关办公/ rddb代表/ voter选民  多个用英文逗号间隔")
+    private String obj2;
     /**
      * 创建者
      */

src/main/java/com/ydool/boot/modules/rddb/entity/Notice.java

@@ -98,4 +98,8 @@ public class Notice implements Serializable {
 
     @ApiModelProperty(value = "工作评议部门")
     private String reviewWorkDept;
+
+    @ApiModelProperty(value = "json字符串")
+    private String jsonString;
+
 }

src/main/java/com/ydool/boot/modules/rddb/entity/request/appoint/state/AppointScoreStateRequest.java

@@ -73,5 +73,10 @@ public class AppointScoreStateRequest {
     @ApiModelProperty(value = "公示文件附件关联会议名称 英文逗号间隔")
     String publicFileAttachmentConferenceName;
 
+    /**
+     * 测评对象
+     */
+    @ApiModelProperty(value = "admin机关办公/ rddb代表/ voter选民  多个用英文逗号间隔")
+    private String obj2;
 
 }

src/main/java/com/ydool/boot/modules/rddb/service/AppointService.java

@@ -12,10 +12,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ydool.boot.common.result.Ret;
 import com.ydool.boot.core.exception.ResultException;
 import com.ydool.boot.core.service.BaseService;
-import com.ydool.boot.modules.rddb.entity.Appoint;
-import com.ydool.boot.modules.rddb.entity.AppointAttachment;
-import com.ydool.boot.modules.rddb.entity.AppointComment;
-import com.ydool.boot.modules.rddb.entity.AppointUser;
+import com.ydool.boot.modules.rddb.entity.*;
 import com.ydool.boot.modules.rddb.entity.bo.AppointBo;
 import com.ydool.boot.modules.rddb.entity.request.CommentRequest;
 import com.ydool.boot.modules.rddb.entity.request.ScoreRequest;
@@ -55,6 +52,9 @@ public class AppointService extends BaseService<AppointMapper, Appoint> {
     @Autowired
     ConferenceAttachmentService conferenceAttachmentService;
 
+    @Autowired
+    NoticeService noticeService;
+
     /*后台*/
     @Transactional
     public boolean del(String id) {
@@ -150,6 +150,20 @@ public class AppointService extends BaseService<AppointMapper, Appoint> {
                 appointScoreRequest.getPublicFileAttachmentPath(), loginUser, Appoint.STATE_SCORE, "3",
                 appointScoreRequest.getPublicFileAttachmentConferenceId(),
                 appointScoreRequest.getPublicFileAttachmentConferenceName());
+        //发布公告
+        Notice notice = new Notice();
+        notice.setCreatedAt(LocalDateTime.now());
+        notice.setUpdatedAt(LocalDateTime.now());
+        notice.setCreatedId(loginUser.getId());
+        notice.setUpdatedId(loginUser.getId());
+        notice.setTitle(appoint.getProposeName()+"-考试公示");
+        notice.setNoticeDate(LocalDateTime.now().toLocalDate().toString());
+        notice.setUploadPersonnel(loginUser.getId());
+        notice.setType("gg");
+        notice.setObj(appoint.getObj());
+        notice.setFlow("任免督职-考试公示");
+        notice.setJsonString(JSONUtil.toJsonStr(AppointWrapper.build().entityVO(appoint)));
+        noticeService.save(notice);
         return appoint;
     }
 
@@ -256,6 +270,23 @@ public class AppointService extends BaseService<AppointMapper, Appoint> {
                 appointPublicStateRequest.getAnnouncementFileAttachmentPath(), loginUser, Appoint.STATE_PUBLIC,
                 appointPublicStateRequest.getAnnouncementFileAttachmentConferenceId(),
                 appointPublicStateRequest.getAnnouncementFileAttachmentConferenceName());
+
+
+        //发布公告
+        Notice notice = new Notice();
+        notice.setCreatedAt(LocalDateTime.now());
+        notice.setUpdatedAt(LocalDateTime.now());
+        notice.setCreatedId(loginUser.getId());
+        notice.setUpdatedId(loginUser.getId());
+        notice.setTitle(appoint.getProposeName()+"-常委会公告");
+        notice.setNoticeDate(LocalDateTime.now().toLocalDate().toString());
+        notice.setUploadPersonnel(loginUser.getId());
+        notice.setType("gg");
+        notice.setObj(appoint.getObj2());
+        notice.setFlow("任免督职-常委会公告");
+        notice.setJsonString(JSONUtil.toJsonStr(AppointWrapper.build().entityVO(appoint)));
+        noticeService.save(notice);
+
         return !flag ? Ret.fail("操作失败") : Ret.ok().data(AppointWrapper.build().entityVO(appoint));
     }
 
@@ -272,6 +303,7 @@ public class AppointService extends BaseService<AppointMapper, Appoint> {
                 appointPerformRequest.getPerformAttachmentConferenceId(),
                 appointPerformRequest.getPerformAttachmentConferenceName());
         saveAppointUser(appoint.getId(), appointPerformRequest.getPerformUserIds(), loginUser, Appoint.STATE_PERFORM);
+
         return appoint;
     }
 

src/main/resources/views/dist/css/chunk-1e14dbc2.c90d475c.css

@@ -1 +0,0 @@
-.van-pagination[data-v-d415f5e4]{position:fixed;bottom:0;width:100%;z-index:999;background:#fff}.box[data-v-d415f5e4]{display:flex;flex-direction:column;height:100%;font-size:.42667rem}.box .add[data-v-d415f5e4]{width:2.13333rem;height:2.13333rem;position:fixed;right:.32rem;bottom:20%}.box[data-v-d415f5e4] .van-tab.van-tab--active{font-size:.42667rem;font-weight:800}.box .tab-contain[data-v-d415f5e4]{padding:.32rem;padding-bottom:1.12rem}.box .tab-contain .van-cell[data-v-d415f5e4]{margin-bottom:.37333rem}.box .tab-contain .van-cell .custom-title[data-v-d415f5e4]{font-weight:700;font-size:.42667rem}.box .tab-contain .van-cell .custom-title1[data-v-d415f5e4]{font-weight:700;margin-left:.8rem;font-size:.37333rem;color:#47aef3}.box .tab-contain .van-cell .custom-title2[data-v-d415f5e4]{font-weight:700;margin-left:.8rem;font-size:.37333rem;color:#c86b1d}.box .tab-contain .van-cell .van-icon[data-v-d415f5e4]{color:#333}

src/main/resources/views/dist/css/chunk-5957d267.ff242db9.css

@@ -0,0 +1 @@
+.van-pagination[data-v-1e33314c]{position:fixed;bottom:0;width:100%;z-index:999;background:#fff}.box[data-v-1e33314c]{display:flex;flex-direction:column;height:100%;font-size:.42667rem}.box .add[data-v-1e33314c]{width:2.13333rem;height:2.13333rem;position:fixed;right:.32rem;bottom:20%}.box[data-v-1e33314c] .van-tab.van-tab--active{font-size:.42667rem;font-weight:800}.box .tab-contain[data-v-1e33314c]{padding:.32rem;padding-bottom:1.12rem}.box .tab-contain .van-cell[data-v-1e33314c]{margin-bottom:.37333rem}.box .tab-contain .van-cell .custom-title[data-v-1e33314c]{font-weight:700;font-size:.42667rem}.box .tab-contain .van-cell .custom-title1[data-v-1e33314c]{font-weight:700;margin-left:.8rem;font-size:.37333rem;color:#47aef3}.box .tab-contain .van-cell .custom-title2[data-v-1e33314c]{font-weight:700;margin-left:.8rem;font-size:.37333rem;color:#c86b1d}.box .tab-contain .van-cell .van-icon[data-v-1e33314c]{color:#333}

src/main/resources/views/dist/css/chunk-6ef6405d.2b8c44f0.css

@@ -1 +0,0 @@
-.flex-align-center[data-v-e36a57d0]{display:flex;align-items:center}.browse_image[data-v-e36a57d0]{width:2.13333rem;height:2.13333rem}[data-v-e36a57d0] .from_el{display:flex;align-items:center}[data-v-e36a57d0] .from_el .title{width:2.4rem;font-size:.42667rem;flex-shrink:0}[data-v-e36a57d0] .from_el .enclosure{margin-top:.53333rem}[data-v-e36a57d0] .from_el .enclosureBtn{display:inline-block;padding:.21333rem .42667rem;background:#d03a29;border-radius:.10667rem;color:#fff}[data-v-e36a57d0] .from_el .enclosureBtn .enclosureImg{margin-right:.10667rem;width:.34667rem;height:.32rem;vertical-align:middle}.preview-cover[data-v-e36a57d0]{position:absolute;bottom:0;box-sizing:border-box;width:100%;padding:.10667rem;color:#fff;font-size:.32rem;text-align:center;background:rgba(0,0,0,.3)}.browse[data-v-e36a57d0]{margin:.26667rem 0}.browse .browse_delet[data-v-e36a57d0]{width:100%;text-align:right;font-size:.42667rem}.browse .imagesee[data-v-e36a57d0]{width:2.66667rem}

src/main/resources/views/dist/css/chunk-a15cd202.bdf3eee3.css

@@ -1 +0,0 @@
-.evaluate[data-v-74112f46]{margin-top:.8rem;padding:.42667rem .64rem;background:#f8f8f8;border-radius:.21333rem}.evaluate .evaluate-contain[data-v-74112f46]{line-height:.53333rem}.evaluate .evaluate-contain .title[data-v-74112f46]{color:#0071ff}.evaluate .evaluate-bottom[data-v-74112f46]{display:flex;align-items:center;justify-content:space-between;margin-top:.74667rem}.evaluate .evaluate-bottom .date[data-v-74112f46]{color:#8e8f9e}.evaluate .evaluate-bottom .more[data-v-74112f46]{color:#0071ff}.users[data-v-74112f46]{margin-top:-.32rem;padding:.10667rem 0 .21333rem;background-color:#fff;display:flex;flex-wrap:wrap;border-bottom:.02667rem solid #f3f3f3}.users .item[data-v-74112f46]{background-color:#fff2f1;padding:0 .26667rem;font-size:.32rem;color:#333;line-height:.61333rem;border-radius:.29333rem;margin-right:.26667rem;margin-top:.26667rem;position:relative}.users .item .van-icon[data-v-74112f46]{position:absolute;top:0;right:0;transform:translate(50%,-50%);color:#d03a29}.box[data-v-74112f46]{display:flex;flex-direction:column;height:100%;font-size:.37333rem}.box .step .my-swipe .van-swipe-item[data-v-74112f46]{height:4rem;box-sizing:border-box;padding:.8rem .8rem .8rem 1.6rem;display:flex}.box .step .my-swipe .van-swipe-item[data-v-74112f46]:nth-of-type(2){padding:.8rem 1.6rem .8rem .8rem}.box .step .my-swipe .van-swipe-item .step-item[data-v-74112f46]{width:35%;display:inline-block;position:relative;box-sizing:border-box}.box .step .my-swipe .van-swipe-item .step-item.step-three[data-v-74112f46]{width:30%}.box .step .my-swipe .van-swipe-item .step-item.negativeDirection[data-v-74112f46]{width:40%;text-align:right}.box .step .my-swipe .van-swipe-item .step-item.negativeDirection .line[data-v-74112f46]{left:.10667rem;top:.32rem}.box .step .my-swipe .van-swipe-item .step-item.negativeDirection .step-title[data-v-74112f46]{font-size:.32rem;line-height:.48rem;margin-top:.32rem;text-align:center;margin-right:-48%;margin-left:20%}.box .step .my-swipe .van-swipe-item .step-item .stepImg[data-v-74112f46]{position:relative;width:.72rem;height:.72rem}.box .step .my-swipe .van-swipe-item .step-item .line[data-v-74112f46]{width:calc(100% - .90667rem);height:.02667rem;border-bottom:.02667rem dashed #dcdcdc;position:absolute;left:.8rem;top:.32rem}.box .step .my-swipe .van-swipe-item .step-item .line.completedLine[data-v-74112f46]{border-bottom-color:#8ccf8c!important}.box .step .my-swipe .van-swipe-item .step-item .step-title[data-v-74112f46]{font-size:.32rem;line-height:.48rem;margin-top:.32rem;text-align:center;margin-right:8%;margin-left:-70%}.box .step .my-swipe[data-v-74112f46] .van-swipe__indicators .van-swipe__indicator{width:.26667rem;height:.10667rem;background:#88bc88;border-radius:.05333rem;opacity:.5}.box .step .my-swipe[data-v-74112f46] .van-swipe__indicators .van-swipe__indicator.van-swipe__indicator--active{width:.50667rem;height:.10667rem;background:#55b955;border-radius:.05333rem;opacity:.7}.box .step-contain[data-v-74112f46]{flex:1;background:#fff;border-top-right-radius:.8rem;border-top-left-radius:.8rem;padding:.42667rem;padding-bottom:2.13333rem}.box .step-contain .form-ele[data-v-74112f46]{display:flex;align-items:center;padding:.32rem 0;border-bottom:.02667rem solid #f3f3f3;position:relative}.box .step-contain .form-ele .title[data-v-74112f46]{width:3.2rem;font-size:.42667rem;line-height:.53333rem;flex-shrink:0}.box .step-contain .form-ele .notice-contain[data-v-74112f46]{font-size:.42667rem}.box .step-contain .form-ele .input-ele[data-v-74112f46]{flex:1;border:none;outline:none;background:#f8f8f8;padding:.21333rem 1.06667rem .21333rem .53333rem;border-radius:.45333rem}.box .step-contain .form-ele .downIcon[data-v-74112f46]{position:absolute;right:.42667rem;top:.58667rem;z-index:10}.box .step-contain .form-ele .enclosure[data-v-74112f46]{flex:1}.box .step-contain .btn[data-v-74112f46]{margin:0 .42667rem;margin-top:1.6rem;background:#d03a29;border-radius:.53333rem;height:1.06667rem;line-height:1.06667rem;text-align:center;color:#fff}.box .step-contain .btn .enclosureEnd[data-v-74112f46]{width:.48rem;height:.42667rem;margin-right:.16rem;vertical-align:middle}