feats

db/文明创办.pdma.json

@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.1.4",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2023-3-23 14:25:10",
+  "updatedTime": "2023-3-27 19:12:07",
   "dbConns": [],
   "profile": {
     "default": {
@@ -3912,6 +3912,23 @@
           "refDict": "",
           "uiHint": "",
           "id": "7FF626A4-AF1C-4CF5-B356-D46DB6D534B3"
+        },
+        {
+          "defKey": "copy_from",
+          "defName": "复制来源",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+          "id": "1F85BFC4-DBF4-4BA5-9BD8-DC9C2BFA1646"
         }
       ],
       "correlations": [],

pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>com.example</groupId>
     <artifactId>civilizedCity</artifactId>
-    <version>0.0.7</version>
+    <version>0.0.10</version>
     <name>civilizedCity</name>
     <description>civilizedCity</description>
     <properties>

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

@@ -58,13 +58,15 @@ public class SysOrgController extends BaseController {
     @GetMapping("/sysOrg")
     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) throws Exception {
+                             @ApiParam("单位名称") @RequestParam(value = "name", required = false) String name,
+                             @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(null != isResponsible, "is_responsible", isResponsible);
         queryWrapper.gt("status", Constants.STATUS_DELETE);
-        queryWrapper.orderByDesc("create_date");
+        queryWrapper.orderByAsc("sort_no");
         IPage<SysOrg> result = sysOrgService.page(pg, queryWrapper);
 
         return ResponseBean.success(result);

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

@@ -240,6 +240,28 @@ public class TaIssueController extends BaseController {
         return ResponseBean.success(origin);
     }
 
+
+
+    /**
+     * 复制问题单
+     *
+     * @param id 问题单ID
+     * @return 实例对象
+     */
+    @ApiOperation("复制问题单")
+    @PostMapping("/taIssue/{id}/copy")
+    public ResponseBean copy(@ApiParam("对象ID") @PathVariable Integer id) throws Exception {
+
+        TaIssue origin = taIssueService.getById(id);
+        if (null == origin || origin.getStatus() == Constants.STATUS_DELETE) {
+            return ResponseBean.error("未找到原始问题单");
+        }
+
+        SysUser sysUser = currentUser();
+        TaIssue taIssue = taIssueService.copyIssue(origin, sysUser);
+        return ResponseBean.success(taIssue);
+    }
+
     /**
      * 通过主键删除数据
      *

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

@@ -81,6 +81,7 @@ public class TaOrgIssueController extends BaseController {
          queryWrapper.eq("issue_id", issueId);
          queryWrapper.eq(!Constants.ROOT_ORG.equals(sysUser.getOrgId()), "org_id", StringUtils.isEmpty(orgId) ? sysUser.getOrgId() : orgId);
          queryWrapper.eq("status", Constants.STATUS_NORMAL);
+         queryWrapper.orderByDesc("create_date");
          queryWrapper.last("limit 1");
 
          TaOrgIssue taOrgIssue = taOrgIssueService.getOne(queryWrapper);

src/main/java/com/example/civilizedcity/entity/TaIssue.java

@@ -128,6 +128,10 @@ public class TaIssue implements Serializable, Cloneable {
     @ApiModelProperty(name = "状态", notes = "")
     private Integer status;
 
+    @ExcelIgnore
+    @ApiModelProperty(name = "复制来源", notes = "")
+    private String copyFrom;
+
     @ExcelIgnore
     @ApiModelProperty(name = "上报人", notes = "")
     private String createUser;

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

@@ -20,4 +20,8 @@ public interface TaAttachMapper  extends BaseMapper<TaAttach>{
     long deleteNotIn(@Param("idList") List<Integer> idList,
                      @Param("ownerType") String ownerType,
                      @Param("ownerId") String ownerId);
+
+    long copy(@Param("ownerType") String sourceIssue,
+              @Param("fromId") String fromId,
+              @Param("toId") String toId);
 }

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

@@ -31,4 +31,6 @@ public interface TaIssueService extends IBaseService<TaIssue> {
     void updateIssue(TaIssue taIssue, TaIssue origin) throws Exception;
 
     void reject(TaIssue taIssue, TaIssueProcess taIssueProcess, SysUser user) throws Exception;
+
+    TaIssue copyIssue(TaIssue origin, SysUser sysUser);
 }

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

@@ -247,6 +247,48 @@ public class TaIssueServiceImpl extends BaseServiceImpl<TaIssueMapper, TaIssue>
         applicationEventPublisher.publishEvent(new MessagEvent(this, taIssue));
     }
 
+    @Override
+    public TaIssue copyIssue(TaIssue origin, SysUser sysUser) {
+
+        TaIssue taIssue = new TaIssue();
+        taIssue.setCopyFrom(origin.getIssueId().toString());
+        taIssue.setTitle(origin.getTitle());
+        taIssue.setTypeId(origin.getTypeId());
+        taIssue.setTypeName(origin.getTypeName());
+        taIssue.setLocId(origin.getLocId());
+        taIssue.setLocName(origin.getLocName());
+        taIssue.setLocation(origin.getLocation());
+        taIssue.setAddr(origin.getAddr());
+        taIssue.setContent(origin.getContent());
+        taIssue.setProcessNode(Constants.PROCESS_START);
+        taIssue.setProcessNum(1);
+        taIssue.setSourceType(Constants.SOURCE_ISSUE);
+        taIssue.setStatus(Constants.STATUS_NORMAL);
+        taIssue.setCreateUser(origin.getCreateUser());
+        taIssue.setCreateDate(LocalDateTime.now());
+        taIssue.setUserName(origin.getUserName());
+        taIssue.setUserDuty(origin.getUserDuty());
+
+        save(taIssue);
+
+        // 流程开始
+        TaIssueProcess process = new TaIssueProcess();
+        process.setIssueId(taIssue.getIssueId());
+        process.setOrgId(sysUser.getOrgId());
+        process.setProcessNode(taIssue.getProcessNode());
+        process.setProcessStatus(taIssue.getProcessStatus());
+        process.setStatus(Constants.STATUS_NORMAL);
+        process.setCreateUser(sysUser.getUserId());
+        process.setUserName(sysUser.getName());
+        process.setCreateDate(LocalDateTime.now());
+        taIssueProcessMapper.insert(process);
+
+        // copy 图片
+        taAttachMapper.copy(Constants.SOURCE_ISSUE, origin.getIssueId().toString(), taIssue.getIssueId().toString());
+
+        return taIssue;
+    }
+
     Integer getStatValueBy(Object v, Integer def) {
         if (null == v) return def;
         return Integer.valueOf(v.toString());

src/main/resources/mapper/TaAttachMapper.xml

@@ -2,6 +2,28 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.example.civilizedcity.mapper.TaAttachMapper">
+    <insert id="copy">
+        INSERT INTO ta_attach (
+            `file_type`,
+            `name`,
+            `url`,
+            `owner_type`,
+            `owner_id`,
+            `status`,
+            `create_user`
+        )
+        SELECT
+            `file_type`,
+            `name`,
+            `url`,
+            `owner_type`,
+            #{toId},
+            `status`,
+            `create_user`
+        FROM ta_attach
+        WHERE `owner_type` = #{ownerType}
+          AND `owner_id` = #{fromId}
+    </insert>
     <delete id="deleteNotIn">
         DELETE
         FROM