feats

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

@@ -78,6 +78,7 @@ public class CommController extends BaseController {
         String url = String.format("%s/%s", uploadPrefix, newFileName);
         return ResponseBean.success(new HashMap<String, Object>(){{
             put("url", url);
+            put("fileType", fileType);
         }});
     }
 

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

@@ -8,6 +8,7 @@ import com.example.civilizedcity.common.Constants;
 import com.example.civilizedcity.common.ResponseBean;
 import java.util.List;
 
+import com.example.civilizedcity.common.StringUtils;
 import com.example.civilizedcity.entity.SysUser;
 import com.example.civilizedcity.entity.TaAttach;
 import com.example.civilizedcity.entity.TaIssue;
@@ -45,7 +46,15 @@ public class TaOrgIssueController extends BaseController {
     @ApiOperation("通过ID查询单条数据")
     @GetMapping("/taOrgIssue/{id}")
     public ResponseBean queryById(@ApiParam("对象ID") @PathVariable Integer id) throws Exception {
-        return ResponseBean.success(taOrgIssueService.getById(id));
+        TaOrgIssue taOrgIssue = taOrgIssueService.getById(id);
+        if (null == taOrgIssue || taOrgIssue.getStatus() == Constants.STATUS_DELETE) {
+            return ResponseBean.error("未找到记录");
+        }
+
+        List<TaAttach> attachList = taAttachService.getListBy(Constants.SOURCE_ORG_ISSUE, id.toString());
+        taOrgIssue.setAttachList(attachList);
+
+        return ResponseBean.success(taOrgIssue);
     }
      /**
       * 通过ISSUE_ID查询单条数据
@@ -55,10 +64,14 @@ public class TaOrgIssueController extends BaseController {
       */
      @ApiOperation("通过ISSUE_ID查询单条数据")
      @GetMapping("/taIssue/{issueId}/orgIssue")
-     public ResponseBean queryByIssueId(@ApiParam("对象ID") @PathVariable Integer issueId) throws Exception {
+     public ResponseBean queryByIssueId(@ApiParam("对象ID") @PathVariable Integer issueId,
+                                        @ApiParam("申请单位") @RequestParam(value = "orgId", required = false) String orgId) throws Exception {
+
+         SysUser sysUser = currentUser();
 
          QueryWrapper<TaOrgIssue> queryWrapper = new QueryWrapper<>();
          queryWrapper.eq("issue_id", issueId);
+         queryWrapper.eq("org_id", StringUtils.isEmpty(orgId) ? sysUser.getOrgId() : orgId);
          queryWrapper.eq("status", Constants.STATUS_NORMAL);
 
          TaOrgIssue taOrgIssue = taOrgIssueService.getOne(queryWrapper);
@@ -104,21 +117,25 @@ public class TaOrgIssueController extends BaseController {
 //        return ResponseBean.success(taOrgIssue);
 //    }
 //
-//    /**
-//     * 更新数据
-//     *
-//     * @param taOrgIssue 实例对象
-//     * @return 实例对象
-//     */
-//    @ApiOperation("更新数据")
-//    @PutMapping("/taOrgIssue/{id}")
-//    public ResponseBean edit(@ApiParam("对象实体") @RequestBody TaOrgIssue taOrgIssue,
-//                            @ApiParam("对象ID") @PathVariable Integer id ) throws Exception {
-//        taOrgIssue.setOrgIssueId(id);
-//
-//        taOrgIssueService.updateById(taOrgIssue);
-//        return ResponseBean.success(taOrgIssue);
-//    }
+    /**
+     * 更新数据
+     *
+     * @param taOrgIssue 实例对象
+     * @return 实例对象
+     */
+    @ApiOperation("更新数据")
+    @PutMapping("/taOrgIssue/{id}")
+    public ResponseBean edit(@ApiParam("对象实体") @RequestBody TaOrgIssue taOrgIssue,
+                            @ApiParam("对象ID") @PathVariable Integer id ) throws Exception {
+        taOrgIssue.setOrgIssueId(id);
+
+        if (null == taOrgIssue.getAttachList() || taOrgIssue.getAttachList().size() == 0) {
+            return ResponseBean.error("请上传图片");
+        }
+
+        taOrgIssueService.updateData(taOrgIssue);
+        return ResponseBean.success(taOrgIssue);
+    }
 //
 //    /**
 //     * 通过主键删除数据

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

@@ -18,4 +18,6 @@ public interface TaOrgIssueService extends IBaseService<TaOrgIssue> {
      void createNewIssue(TaIssue taIssue, TaIssueProcess taIssueProcess, SysUser sysUser) throws Exception;
 
      TaOrgIssue getByIssueAndOrg(Integer issueId, String orgId);
+
+     void updateData(TaOrgIssue taOrgIssue) throws Exception;
  }

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

@@ -4,16 +4,15 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.example.civilizedcity.common.Constants;
 import com.example.civilizedcity.common.StringUtils;
 import com.example.civilizedcity.entity.*;
-import com.example.civilizedcity.mapper.TaFeedbackMapper;
-import com.example.civilizedcity.mapper.TaIssueMapper;
-import com.example.civilizedcity.mapper.TaIssueProcessMapper;
+import com.example.civilizedcity.mapper.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.example.civilizedcity.mapper.TaOrgIssueMapper;
 import com.example.civilizedcity.service.TaOrgIssueService;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 单位问题单;(ta_org_issue)表服务实现类
@@ -33,6 +32,9 @@ public class TaOrgIssueServiceImpl extends BaseServiceImpl<TaOrgIssueMapper, TaO
     @Autowired
     TaFeedbackMapper taFeedbackMapper;
 
+    @Autowired
+    TaAttachMapper taAttachMapper;
+
     @Override
     public IPage<TaIssue> getIssuePageBy(IPage<TaIssue> pg, String orgId, String sourceType, String bizStatus) {
 
@@ -77,8 +79,8 @@ public class TaOrgIssueServiceImpl extends BaseServiceImpl<TaOrgIssueMapper, TaO
         TaOrgIssue taOrgIssue = new TaOrgIssue();
         taOrgIssue.setIssueId(taIssue.getIssueId());
         taOrgIssue.setOrgId(taIssue.getOrgId());
-        taOrgIssue.setProcessNode(Constants.PROCESS_START);
-        taOrgIssue.setProcessStatus(Constants.APPLY_READY); // 状态是未审核
+        taOrgIssue.setProcessNode(Constants.PROCESS_ASSIGNED);
+        taOrgIssue.setProcessStatus(null);
         taOrgIssue.setStatus(Constants.STATUS_NORMAL);
         taOrgIssue.setCreateDate(LocalDateTime.now());
         taOrgIssue.setCreateUser(sysUser.getUserId());
@@ -98,4 +100,31 @@ public class TaOrgIssueServiceImpl extends BaseServiceImpl<TaOrgIssueMapper, TaO
     public TaOrgIssue getByIssueAndOrg(Integer issueId, String orgId) {
         return baseMapper.getByIssueAndOrg(issueId, orgId);
     }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void updateData(TaOrgIssue taOrgIssue) throws Exception {
+        updateById(taOrgIssue);
+
+        // 保存文件
+        List<TaAttach> attachList = taOrgIssue.getAttachList();
+        List<Integer> idList = new ArrayList<>();
+        for (TaAttach item : attachList) {
+            item.setOwnerType(Constants.SOURCE_ORG_ISSUE);
+            item.setOwnerId(taOrgIssue.getOrgIssueId().toString());
+            item.setStatus(Constants.STATUS_NORMAL);
+            item.setCreateDate(LocalDateTime.now());
+
+            if (null == item.getAttachId()) {
+                taAttachMapper.insert(item);
+            } else {
+                taAttachMapper.updateById(item);
+            }
+            idList.add(item.getAttachId());
+        }
+
+        // 删除部分文件
+        taAttachMapper.deleteNotIn(idList, Constants.SOURCE_ISSUE, taOrgIssue.getOrgIssueId().toString());
+        taOrgIssue.setAttachList(attachList);
+    }
 }

src/main/resources/mapper/TaOrgIssueMapper.xml

@@ -55,9 +55,9 @@
     </select>
     <select id="statMaIndex" resultType="java.util.Map">
         select
-            SUM(IF(TO_DAYS(now()) > TO_DAYS(s.expire_date), 1, 0)) as delay_num,
-            SUM(s.process_node = '03', 1, 0) as end_num,
-            SUM(s.process_node != '03', 1, 0) as doing_num
+            SUM( IF ( TO_DAYS( now( ) ) > TO_DAYS( s.expire_date ) AND s.process_node != '03', 1, 0 ) ) AS delay_num,
+            SUM( IF (s.process_node = '03', 1, 0 ) ) AS end_num,
+            SUM( IF (s.process_node != '03', 1, 0 ) ) AS doing_num
         from ta_org_issue t
                  INNER JOIN ta_issue s on t.issue_id = s.issue_id AND t.org_id = s.org_id
         where t.org_id = #{orgId}