F

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

@@ -66,6 +66,22 @@ public class TaOrgIssueController extends BaseController {
 
         return ResponseBean.success(taOrgIssue);
     }
+
+    /**
+     * 通过ID查询单条数据
+     *
+     * @param id 主键
+     * @return 实例对象
+     */
+    @ApiOperation("通过ID查询单条数据")
+    @GetMapping("/taOrgIssueId/{id}")
+    public ResponseBean queryByListId(@ApiParam("对象ID") @PathVariable Integer id) throws Exception {
+        List<TaOrgIssue> taOrgIssue = taOrgIssueService.getByListIssueId(id);
+
+
+        return ResponseBean.success(taOrgIssue);
+    }
+
      /**
       * 通过ISSUE_ID查询单条数据
       *
@@ -107,6 +123,7 @@ public class TaOrgIssueController extends BaseController {
     public ResponseBean list(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                              @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                              @ApiParam("问题单ID") @RequestParam(value = "issueId", required = false) String issueId,
+                             @ApiParam("status") @RequestParam(value = "status", required = false) String status,
                              @ApiParam("点位") @RequestParam(value = "locId", required = false) String locId,
                              @ApiParam("数据来源") @RequestParam(value ="sourceType", required = false) String sourceType,
                              @ApiParam("类型ID") @RequestParam(value = "typeId", required = false) String typeId,
@@ -120,6 +137,7 @@ public class TaOrgIssueController extends BaseController {
 
         Map<String, Object> params = new HashMap<>();
         params.put("issueId", issueId);
+        params.put("status", status);
         params.put("typeId", typeId);
         params.put("bizStatus", bizStatus);
         params.put("sourceType", sourceType);
@@ -149,11 +167,15 @@ public class TaOrgIssueController extends BaseController {
     }
 
 
+
+
+
+
      /**
       * 分页查询
       *
-      * @param pageNum 当前页码
-      * @param pageSize 每页条数
+      * @param
+      * @param
       * @return 查询结果
       */
      @ApiOperation("分页查询")

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

@@ -58,4 +58,8 @@ public class TaOrgIssue implements Serializable,Cloneable{
     @ApiModelProperty(name = "文件列表",notes = "")
     private List<TaAttach> attachList ;
 
+     @TableField(exist = false)
+     @ApiModelProperty(name = "部门名称",notes = "")
+     private String orgName ;
+
 }

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

@@ -18,7 +18,8 @@ import java.util.Map;
 @Mapper
 public interface TaOrgIssueMapper  extends BaseMapper<TaOrgIssue>{
 
-     IPage<TaIssue> getIssuePageBy(IPage<TaIssue> pg, @Param("params") Map<String, Object> params);
+    IPage<TaIssue> getIssuePageBy(IPage<TaIssue> pg, @Param("params") Map<String, Object> params);
+
 
      TaOrgIssue getByIssueAndOrg(@Param("issueId") Integer issueId, @Param("orgId") String orgId);
 
@@ -28,4 +29,6 @@ public interface TaOrgIssueMapper  extends BaseMapper<TaOrgIssue>{
 
     List<TaIssue> getIssueListBy(@Param("params") Map<String, Object> params);
     int removeByIssueId(@Param("issueId") String issueId);
+
+    List<TaOrgIssue> getByListIssueId(@Param("issueId") Integer issueId);
 }

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

@@ -29,4 +29,8 @@ public interface TaOrgIssueService extends IBaseService<TaOrgIssue> {
      void removeByIssueId(String issueId);
 
      void createNewIssue2(TaIssue taIssue, TaOrgIssue originOrgIssue, TaIssueProcess taIssueProcess, SysUser sysUser) throws Exception;
+
+
+
+     List<TaOrgIssue> getByListIssueId(Integer issueId);
 }

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

@@ -66,6 +66,7 @@ public class TaOrgIssueServiceImpl extends BaseServiceImpl<TaOrgIssueMapper, TaO
         return baseMapper.getIssuePageBy(pg, params);
     }
 
+
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void createNewIssue(TaIssue taIssue, TaIssueProcess taIssueProcess, SysUser sysUser) throws Exception {
@@ -199,4 +200,9 @@ public class TaOrgIssueServiceImpl extends BaseServiceImpl<TaOrgIssueMapper, TaO
         applicationEventPublisher.publishEvent(new MessagEvent(this, taOrgIssue));
     }
 
+    @Override
+    public List<TaOrgIssue> getByListIssueId(Integer issueId) {
+        return baseMapper.getByListIssueId(issueId);
+    }
+
 }

src/main/resources/mapper/TaOrgIssueMapper.xml

@@ -6,8 +6,8 @@
         UPDATE ta_org_issue t
         SET t.process_status = #{processStatus}
         WHERE
-            t.org_id = #{orgId}
-          AND t.issue_id = #{issueId}
+        t.org_id = #{orgId}
+        AND t.issue_id = #{issueId}
     </update>
     <update id="removeByIssueId">
         UPDATE ta_org_issue t
@@ -22,17 +22,20 @@
         FROM
         ta_issue t
         WHERE
-            EXISTS (
-            SELECT
-                *
-            FROM
-                ta_org_issue s
-            WHERE
-                s.issue_id = t.issue_id
-                AND s.org_id = t.org_id
-                AND s.`status` &gt; -1
-            )
-            AND t.org_id = #{params.orgId}
+        EXISTS (
+        SELECT
+        *
+        FROM
+        ta_org_issue s
+        WHERE
+        s.issue_id = t.issue_id
+        AND s.org_id = t.org_id
+        <if test="params.status != null and params.status != ''">
+            AND s.`status` = #{params.status}
+        </if>
+
+        )
+        AND t.org_id = #{params.orgId}
         <if test="params.issueId != null and params.issueId != ''">
             AND t.issue_id = #{params.issueId}
         </if>
@@ -68,46 +71,59 @@
         <if test="params.userName != null and params.userName != ''">
             AND t.user_name LIKE CONCAT('%', #{params.userName}, '%')
         </if>
-            AND t.`status` &gt; -1
+        AND t.`status` &gt; -1
         ORDER BY
-            t.create_date DESC
+        t.create_date DESC
     </sql>
 
     <select id="getIssuePageBy" resultType="com.example.civilizedcity.entity.TaIssue">
         <include refid="getOrgIssueList"></include>
+
     </select>
+
+
     <select id="getByIssueAndOrg" resultType="com.example.civilizedcity.entity.TaOrgIssue">
         SELECT
-            *
+        *
         FROM
-            ta_org_issue t
+        ta_org_issue t
         WHERE
-            t.issue_id = #{issueId}
-          AND t.org_id = #{orgId}
-          AND t.`status` = 1
+        t.issue_id = #{issueId}
+        AND t.org_id = #{orgId}
+        AND t.`status` = 1
         ORDER BY t.create_date DESC
         LIMIT 1
     </select>
     <select id="statMaIndex" resultType="java.util.Map">
         select
-            SUM( IF (TO_DAYS(NOW()) &gt; TO_DAYS( t.expire_date ) AND t.process_node != '03', 1, 0 ) ) AS delay_num,
-            SUM( IF (t.process_node = '03', 1, 0 ) ) AS end_num,
-            SUM( IF (t.process_node != '03', 1, 0 ) ) AS doing_num
+        SUM( IF (TO_DAYS(NOW()) &gt; TO_DAYS( t.expire_date ) AND t.process_node != '03', 1, 0 ) ) AS delay_num,
+        SUM( IF (t.process_node = '03', 1, 0 ) ) AS end_num,
+        SUM( IF (t.process_node != '03', 1, 0 ) ) AS doing_num
         from ta_issue t
         where EXISTS (
-                SELECT
-                    *
-                FROM
-                    ta_org_issue s
-                WHERE
-                    s.issue_id = t.issue_id
-                  AND s.org_id = t.org_id
-                  AND s.`status` &gt; - 1
-            )
-            and t.org_id = #{orgId}
-          and t.`status` &gt; -1
+        SELECT
+        *
+        FROM
+        ta_org_issue s
+        WHERE
+        s.issue_id = t.issue_id
+        AND s.org_id = t.org_id
+        AND s.`status` &gt; - 1
+        )
+        and t.org_id = #{orgId}
+        and t.`status` &gt; -1
     </select>
     <select id="getIssueListBy" resultType="com.example.civilizedcity.entity.TaIssue">
         <include refid="getOrgIssueList"></include>
     </select>
+    <select id="getByListIssueId" resultType="com.example.civilizedcity.entity.TaOrgIssue">
+        SELECT
+        so.name as orgName,oi.*
+        FROM
+        ta_org_issue oi
+        INNER JOIN sys_org so on oi.org_id=so.org_id and so.`status`=1
+        WHERE
+        oi.issue_id = #{issueId}
+
+    </select>
 </mapper>