二级岗位去除发送短信

ruoyi-process/src/main/java/com/ruoyi/process/secondpostchange/controller/SecondPostChangeController.java

@@ -562,8 +562,8 @@ public class SecondPostChangeController extends BaseController {
     @ResponseBody
     @Log(title = "审核流程", businessType = BusinessType.AUDIT)
     @Transactional(rollbackFor = Exception.class)
-    public AjaxResult completeParent(String comment ,String approved,String declarationId,String noteFlag,String attachmentZGBM) throws Exception {
-        return secondPostChangeService.completeParent(comment,approved,declarationId,noteFlag,attachmentZGBM);
+    public AjaxResult completeParent(String comment ,String approved,String declarationId,String attachmentZGBM) throws Exception {
+        return secondPostChangeService.completeParent(comment,approved,declarationId,attachmentZGBM);
     }
 
     /**

ruoyi-process/src/main/java/com/ruoyi/process/secondpostchange/service/ISecondPostChangeService.java

@@ -135,10 +135,9 @@ public interface ISecondPostChangeService {
      * @param comment
      * @param approved
      * @param declarationId
-     * @param noteFlag
      * @return
      */
-    AjaxResult completeParent(String comment ,String approved,String declarationId,String noteFlag,String attachmentZGBM);
+    AjaxResult completeParent(String comment ,String approved,String declarationId,String attachmentZGBM);
 
     /**
      * 获取合并后的数据excel

ruoyi-process/src/main/java/com/ruoyi/process/secondpostchange/service/impl/SecondPostChangeServiceImpl.java

@@ -714,7 +714,7 @@ public class SecondPostChangeServiceImpl implements ISecondPostChangeService {
     }
 
     @Override
-    public AjaxResult completeParent(String comment, String approved, String declarationId, String noteFlag, String attachmentZGBM) {
+    public AjaxResult completeParent(String comment, String approved, String declarationId, String attachmentZGBM) {
         List<DeclarationVo> declarationVoList = declarationMapper.selectDeclarationByParentId(declarationId);
         String nextUserName = "";
         Task finalTask = new TaskEntityImpl();
@@ -825,12 +825,6 @@ public class SecondPostChangeServiceImpl implements ISecondPostChangeService {
         secondPostChangeVos.stream().forEach((SecondPostChangeVo e) -> secondPostChangeMapper.updateSecondPostChange(e));
         //合并消息待办处理
         completeParentMessageAndBacklog(value, Long.valueOf(declarationId), declarationVoList,nextUserName);
-        //发送提示短信
-        if("true".equals(noteFlag)){
-            //查询下一节点用户昵称，手机号
-            String message = "尊敬的" + parentUser.getUserName() + "，您有待处理的审批，请及时处理。事业单位人事管理信息系统，" + DateUtils.datePath2();
-            noteUtil.setShortMessage(parentUser.getPhonenumber(),message);
-        }
         return success();
     }
 
@@ -912,7 +906,15 @@ public class SecondPostChangeServiceImpl implements ISecondPostChangeService {
             jsonObject.put("name",s.getName());
             jsonObject.put("sex",sysDictDataService.selectDictLabel("sys_user_sex",s.getSex()));
             jsonObject.put("birthTime",DateUtils.parseDateToStr("yyyy-MM-dd",s.getBirthTime()));
-            jsonObject.put("highestEducation",sysDictDataService.selectDictLabel("per_education",s.getHighestEducation())+"("+sysDictDataService.selectDictLabel("per_degree",s.getDegree())+")");
+            if(StringUtils.isNotEmpty(s.getAchievement())){
+                String highestEducation = sysDictDataService.selectDictLabel("per_education",s.getHighestEducation());
+                if(StringUtils.isNotEmpty(s.getDegree())){
+                    highestEducation += "("+sysDictDataService.selectDictLabel("per_degree",s.getDegree())+")";
+                }
+                jsonObject.put("highestEducation",highestEducation);
+            }else {
+                jsonObject.put("highestEducation","");
+            }
             jsonObject.put("leadershipPos",s.getLeadershipPos());
             jsonObject.put("currentPostType", sysDictDataService.selectDictLabel("per_post_type", s.getCurrentPostType()) + DateUtils.parseDateToStr("yyyy-MM-dd",s.getCurrentPostTime()));
             jsonObject.put("currentPostGrades", sysDictDataService.selectDictLabel("post_grades", s.getCurrentPostGrades()) + DateUtils.parseDateToStr("yyyy-MM-dd",s.getCurrentPostTime()));

ruoyi-process/src/main/resources/templates/process/declaration/todo.html

@@ -715,31 +715,54 @@
                     return false;
                 }
             }
-            var index = layer.open({
-                type: 2,
-                area: [600 + 'px', 400 + 'px'],
-                fix: false,
-                //不固定
-                maxmin: true,
-                shade: 0.3,
-                title: "填写申报意见",
-                content: url,
-                btn: ['确定并发送短信', '确定', '关闭'],
-                // 弹层外区域关闭
-                shadeClose: false,
-                yes: function (index, layero) {
-                    var iframeWin = layero.find('iframe')[0];
-                    iframeWin.contentWindow.submitHandler('3');
-                },
-                btn2: function(index, layero) {
-                    var iframeWin = layero.find('iframe')[0];
-                    iframeWin.contentWindow.submitHandler(button);
-                    return false;
-                },
-                cancel: function (index) {
-                    return true;
-                }
-            });
+            if(type.toString().indexOf(dec_type.EJGW) != -1){
+                var index = layer.open({
+                    type: 2,
+                    area: [600 + 'px', 400 + 'px'],
+                    fix: false,
+                    //不固定
+                    maxmin: true,
+                    shade: 0.3,
+                    title: "填写申报意见",
+                    content: url,
+                    btn: ['确定', '关闭'],
+                    // 弹层外区域关闭
+                    shadeClose: false,
+                    yes: function (index, layero) {
+                        var iframeWin = layero.find('iframe')[0];
+                        iframeWin.contentWindow.submitHandler(button);
+                    },
+                    cancel: function (index) {
+                        return true;
+                    }
+                });
+            }else {
+                var index = layer.open({
+                    type: 2,
+                    area: [600 + 'px', 400 + 'px'],
+                    fix: false,
+                    //不固定
+                    maxmin: true,
+                    shade: 0.3,
+                    title: "填写申报意见",
+                    content: url,
+                    btn: ['确定并发送短信', '确定', '关闭'],
+                    // 弹层外区域关闭
+                    shadeClose: false,
+                    yes: function (index, layero) {
+                        var iframeWin = layero.find('iframe')[0];
+                        iframeWin.contentWindow.submitHandler('3');
+                    },
+                    btn2: function(index, layero) {
+                        var iframeWin = layero.find('iframe')[0];
+                        iframeWin.contentWindow.submitHandler(button);
+                        return false;
+                    },
+                    cancel: function (index) {
+                        return true;
+                    }
+                });
+            }
         }
         //人事综合管理部门终审领导同意页面
         else if (button == 1 && (filePermissions == '4')){

ruoyi-process/src/main/resources/templates/process/secondpostchange/parentApproval.html

@@ -86,10 +86,6 @@
             "declarationId" : $("#declarationId").val(),
             "attachmentZGBM" : attachmentZGBM
         };
-        //若a=3,则同意并发送短信
-        if(a==3){
-            data.noteFlag = 'true';
-        }
         if(filePermissions != 2){
             $.operate.submitCustom(url, "post", "json", data,'',true,2);
         }else {