Merge branch 'h5' of http://git.ycjcjy.com/civilized_city/service into h5

src/main/java/com/example/civilizedcity/controller/SysOrgController.java

@@ -59,11 +59,13 @@ public class SysOrgController extends BaseController {
     public ResponseBean list(@ApiParam("页码") @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                              @ApiParam("单页数据量") @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
                              @ApiParam("单位名称") @RequestParam(value = "name", required = false) String name,
+                             @ApiParam("父级单位") @RequestParam(value = "parentId", required = false) String parentId,
                              @ApiParam("是否责任单位") @RequestParam(value = "isResponsible", required = false) Integer isResponsible) throws Exception {
 
         IPage<SysOrg> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<SysOrg> queryWrapper = new QueryWrapper<>();
         queryWrapper.like(!StringUtils.isEmpty(name), "name", name);
+        queryWrapper.eq(!StringUtils.isEmpty(parentId), "org_p_id", parentId);
         queryWrapper.eq(null != isResponsible, "is_responsible", isResponsible);
         queryWrapper.gt("status", Constants.STATUS_DELETE);
         queryWrapper.orderByAsc("sort_no");

src/main/java/com/example/civilizedcity/controller/TaIssueProcessController.java

@@ -6,9 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.example.civilizedcity.common.*;
 
-import com.example.civilizedcity.entity.SysOrg;
-import com.example.civilizedcity.entity.SysUser;
-import com.example.civilizedcity.entity.TaIssue;
+import com.example.civilizedcity.entity.*;
 import com.example.civilizedcity.service.SysOrgService;
 import com.example.civilizedcity.service.TaIssueService;
 import com.example.civilizedcity.service.TaOrgIssueService;
@@ -17,7 +15,6 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import com.example.civilizedcity.entity.TaIssueProcess;
 import com.example.civilizedcity.service.TaIssueProcessService;
 
 /**
@@ -120,6 +117,41 @@ public class TaIssueProcessController extends BaseController {
         return ResponseBean.success(taIssueProcess);
     }
 
+
+    /**
+     * 交办
+     *
+     * @param taIssueProcess 实例对象
+     * @return 实例对象
+     */
+//    @SaCheckPermission("manager")
+    @ApiOperation("再次交办")
+    @PostMapping("/taIssueProcess/assigned2")
+    public ResponseBean assigned2(@ApiParam("对象实体") @RequestBody TaIssueProcess taIssueProcess) throws Exception {
+        TaIssue taIssue = checkIssue(taIssueProcess);
+
+        if (StringUtils.isEmpty(taIssueProcess.getNextOrg())) {
+            return ResponseBean.error("请指定交办单位");
+        }
+
+        TaOrgIssue taOrgIssue = taOrgIssueService.getByIssueAndOrg(taIssue.getIssueId(), taIssue.getOrgId());
+        if (null == taOrgIssue) {
+            return ResponseBean.error("未找到当前交办单位");
+        }
+
+//        if (StringUtils.isEmpty(taIssueProcess.getExpireDate())) {
+//            return ResponseBean.error("请设置截止日期");
+//        } else {
+//            if (DateUtils.isAfter(taIssueProcess.getExpireDate() + " 23:59:59")) {
+//                return ResponseBean.error("请设置有效的截止日期");
+//            }
+//        }
+
+        SysUser sysUser = currentUser();
+        taOrgIssueService.createNewIssue2(taIssue, taOrgIssue, taIssueProcess, sysUser);
+        return ResponseBean.success(taIssueProcess);
+    }
+
     /**
      * 管理员驳回问题单
      *

src/main/java/com/example/civilizedcity/mapper/TaIssueProcessMapper.java

@@ -12,5 +12,6 @@ import com.example.civilizedcity.entity.TaIssueProcess;
  */
 @Mapper
 public interface TaIssueProcessMapper  extends BaseMapper<TaIssueProcess>{
-    
-}
+
+     long removeIssueProcess(Integer issueId, String orgId);
+ }

src/main/java/com/example/civilizedcity/service/TaOrgIssueService.java

@@ -27,4 +27,6 @@ public interface TaOrgIssueService extends IBaseService<TaOrgIssue> {
      List<TaIssue> getIssueListBy(Map<String, Object> params);
 
      void removeByIssueId(String issueId);
+
+     void createNewIssue2(TaIssue taIssue, TaOrgIssue originOrgIssue, TaIssueProcess taIssueProcess, SysUser sysUser) throws Exception;
 }

src/main/java/com/example/civilizedcity/service/impl/TaIssueServiceImpl.java

@@ -73,6 +73,7 @@ public class TaIssueServiceImpl extends BaseServiceImpl<TaIssueMapper, TaIssue>
         // 督察员
         if (Constants.DUTY_INSPECTOR.equals(duty)) {
             Map<String, Object> res = baseMapper.statMaIndex(user.getUserId());
+            if (null == res) res = new HashMap<>();
             result.add(new StatVo().setName("已上报").setValue(getStatValueBy(res.get("published_num"), 0)));
             result.add(new StatVo().setName("已交办").setValue(getStatValueBy(res.get("assigned_num"), 0)));
             result.add(new StatVo().setName("未交办").setValue(getStatValueBy(res.get("unassigned_num"), 0)));
@@ -89,6 +90,7 @@ public class TaIssueServiceImpl extends BaseServiceImpl<TaIssueMapper, TaIssue>
         // 单位人员 或者 单位管理员
         else if (Constants.DUTY_ORG_USER.equals(duty) || Constants.DUTY_ORG_MANAGER.equals(duty)) {
             Map<String, Object> res = taOrgIssueMapper.statMaIndex(user.getOrgId());
+            if (null == res) res = new HashMap<>();
             result.add(new StatVo().setName("处理中").setValue(getStatValueBy(res.get("doing_num"), 0)));
             result.add(new StatVo().setName("已办结").setValue(getStatValueBy(res.get("end_num"), 0)));
             result.add(new StatVo().setName("已逾期").setValue(getStatValueBy(res.get("delay_num"), 0)));
@@ -97,6 +99,7 @@ public class TaIssueServiceImpl extends BaseServiceImpl<TaIssueMapper, TaIssue>
         // 查询人员
         else if (Constants.DUTY_QUERY_PERSON.equals(duty)) {
             Map<String, Object> res = baseMapper.statMaIndex(null);
+            if (null == res) res = new HashMap<>();
             result.add(new StatVo().setName("未处理").setValue(getStatValueBy(res.get("unassigned_num"), 0)));
             result.add(new StatVo().setName("处理中").setValue(getStatValueBy(res.get("assigned_num"), 0)));
             result.add(new StatVo().setName("已办结").setValue(getStatValueBy(res.get("end_num"), 0)));
@@ -106,9 +109,7 @@ public class TaIssueServiceImpl extends BaseServiceImpl<TaIssueMapper, TaIssue>
         else {
 //            Map<String, Object> res = taFeedbackMapper.statMaIndex(person.getPersonId());
             Map<String, Object> res = taFeedbackMapper.statMaIndex(user.getUserId());
-            if (null == res) {
-                res = new HashMap<>();
-            }
+            if (null == res) res = new HashMap<>();
             result.add(new StatVo().setName("未处理").setValue(getStatValueBy(res.get("unassigned_num"), 0)));
             result.add(new StatVo().setName("已处理").setValue(getStatValueBy(res.get("assigned_num"), 0) + getStatValueBy(res.get("end_num"), 0)));
             result.add(new StatVo().setName("已打回").setValue(getStatValueBy(res.get("reject_num"), 0)));

src/main/java/com/example/civilizedcity/service/impl/TaOrgIssueServiceImpl.java

@@ -158,4 +158,45 @@ public class TaOrgIssueServiceImpl extends BaseServiceImpl<TaOrgIssueMapper, TaO
         taIssueApplyMapper.removeByIssueId(issueId);
        }
 
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void createNewIssue2(TaIssue taIssue, TaOrgIssue originOrgIssue, TaIssueProcess taIssueProcess, SysUser sysUser) throws Exception {
+        // 1. 先修改主记录信息
+        taIssue.setProcessNode(Constants.PROCESS_ASSIGNED);
+        taIssue.setProcessStatus(Constants.APPLY_PASS);
+        taIssue.setOrgId(taIssueProcess.getNextOrg());
+//        taIssue.setExpireDate(taIssueProcess.getExpireDate());
+//        taIssue.setProcessNum(taIssue.getProcessNum() + 1); // 交办次数
+        taIssueMapper.updateById(taIssue);
+
+        // 2. 新增机构问题单
+        TaOrgIssue taOrgIssue = new TaOrgIssue();
+        taOrgIssue.setIssueId(taIssue.getIssueId());
+        taOrgIssue.setOrgId(taIssue.getOrgId());
+        taOrgIssue.setProcessNode(Constants.PROCESS_ASSIGNED);
+        taOrgIssue.setProcessStatus(null);
+        taOrgIssue.setStatus(Constants.STATUS_NORMAL);
+        taOrgIssue.setCreateDate(LocalDateTime.now());
+        taOrgIssue.setCreateUser(sysUser.getUserId());
+        save(taOrgIssue);
+        // 父级单位的-暂时先处理为删除
+        originOrgIssue.setStatus(-2);
+        updateById(originOrgIssue);
+
+        // 3. 保存流程节点记录
+        taIssueProcess.setProcessId(null);
+        taIssueProcess.setProcessNode(Constants.PROCESS_ASSIGNED);
+        taIssueProcess.setProcessStatus(Constants.APPLY_PASS);
+        taIssueProcess.setCreateUser(sysUser.getUserId());
+        taIssueProcess.setCreateDate(LocalDateTime.now());
+        taIssueProcess.setStatus(Constants.STATUS_NORMAL);
+        taIssueProcessMapper.insert(taIssueProcess);
+        // 父级单位的流程，暂时更新为删除
+        taIssueProcessMapper.removeIssueProcess(taIssue.getIssueId(), originOrgIssue.getOrgId());
+
+        // 发送短信通知
+        applicationEventPublisher.publishEvent(new MessagEvent(this, taOrgIssue));
+    }
+
 }

src/main/resources/mapper/TaIssueProcessMapper.xml

@@ -2,5 +2,10 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.example.civilizedcity.mapper.TaIssueProcessMapper">
-    
+
+    <update id="removeIssueProcess">
+        update ta_issue_process
+        set status = status - 3
+        where issue_id = #{issueId} and org_id = #{orgId}
+    </update>
 </mapper>

src/main/resources/mapper/TaOrgIssueMapper.xml

@@ -102,7 +102,7 @@
                 WHERE
                     s.issue_id = t.issue_id
                   AND s.org_id = t.org_id
-                  AND s.`status` > - 1
+                  AND s.`status` > - 1
             )
             and t.org_id = #{orgId}
           and t.`status` > -1