前端管理界面接口---

project-zcustom/src/main/java/com/project/zcustom/controller/unit/LargeIssueController.java

@@ -30,7 +30,7 @@ public class LargeIssueController extends BaseController {
 
     @GetMapping("/list")
     public AjaxResult list(LargeIssue entity) {
-        return AjaxResult.success("查询成功", largeIssueService.pagingLargeIssueList(entity));
+        return AjaxResult.success("查询成功", largeIssueService.selectList(entity));
     }
 
     @GetMapping("/listAll")
@@ -48,7 +48,7 @@ public class LargeIssueController extends BaseController {
 
     @GetMapping(value = "/getInfo/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
-        return AjaxResult.success("查询成功", largeIssueService.getById(id));
+        return AjaxResult.success("查询成功", largeIssueService.selectLargeIssueById(id));
     }
 
     @PreAuthorize("@ss.hasPermi('zcustom:issue:add')")

project-zcustom/src/main/java/com/project/zcustom/domain/unit/LargeIssue.java

@@ -46,6 +46,8 @@ public class LargeIssue extends CustomBaseEntity {
     @ApiModelProperty("所属项目id")
     private Integer projectId;
 
+    private String projectName;
+
     /**
      * 问题状态（0代表已解决  2代表待解决）
      */

project-zcustom/src/main/java/com/project/zcustom/domain/unit/LargeUnit.java

@@ -22,8 +22,7 @@ import io.swagger.annotations.ApiModelProperty;
 @Accessors(chain = true)
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = false)
-@TableName("large_plat_app_org")
-@ApiModel(value = "large_plat_app_org实体类")
+@ApiModel(value = "large_unit实体类")
 public class LargeUnit extends CustomBaseEntity {
 
     /**
@@ -38,14 +37,16 @@ public class LargeUnit extends CustomBaseEntity {
      */
     @Excel(name = "地区编码")
     @ApiModelProperty("地区编码")
-    private String appOrg;
+    private String unitCode;
+
+    private String parentUnitCode;
 
     /**
      * 地区名称
      */
     @Excel(name = "地区名称")
     @ApiModelProperty("地区名称")
-    private String appName;
+    private String unitName;
 
     /**
      * 接入标志

project-zcustom/src/main/java/com/project/zcustom/service/unit/ILargeIssueService.java

@@ -86,4 +86,7 @@ public interface ILargeIssueService extends IService<LargeIssue> {
      *  真删接口
      */
     public void reallyDeleteLargeIssue(LambdaQueryWrapper<LargeIssue> lqw);
+
+    public List<LargeIssue> selectList(LargeIssue largeIssue);
+    public LargeIssue selectLargeIssueById(Long id);
 }

project-zcustom/src/main/java/com/project/zcustom/service/unit/impl/LargeIssueServiceImpl.java

@@ -4,6 +4,7 @@ import com.project.zcustom.domain.unit.LargeIssue;
 import com.project.zcustom.mapper.unit.LargeIssueMapper;
 import com.project.zcustom.service.unit.ILargeIssueService;
 import com.project.common.core.domain.search.PageParamVo;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -23,6 +24,9 @@ import java.util.List;
 @Service
 public class LargeIssueServiceImpl extends ServiceImpl<LargeIssueMapper, LargeIssue> implements ILargeIssueService {
 
+    @Autowired
+    private LargeIssueMapper largeIssueMapper;
+
     /**
      * 组装查询条件
      */
@@ -164,4 +168,12 @@ public class LargeIssueServiceImpl extends ServiceImpl<LargeIssueMapper, LargeIs
     public void reallyDeleteLargeIssue(LambdaQueryWrapper<LargeIssue> lqw){
         baseMapper.reallyDeleteByWrapper(lqw);
     }
+
+    public List<LargeIssue> selectList(LargeIssue largeIssue){
+        return largeIssueMapper.selectLargeIssueList(largeIssue);
+    }
+
+    public LargeIssue selectLargeIssueById(Long id){
+        return largeIssueMapper.selectLargeIssueById(id);
+    }
 }

project-zcustom/src/main/java/com/project/zcustom/service/unit/impl/LargeUnitServiceImpl.java

@@ -32,11 +32,11 @@ public class LargeUnitServiceImpl extends ServiceImpl<LargeUnitMapper, LargeUnit
      */
     private LambdaQueryWrapper<LargeUnit> getLambdaQueryWrapper(LargeUnit largeUnit) {
         LambdaQueryWrapper<LargeUnit> lqw = new LambdaQueryWrapper<LargeUnit>();
-                        if (StringUtils.isNotBlank(largeUnit.getAppOrg())){
-                        lqw.eq(LargeUnit::getAppOrg ,largeUnit.getAppOrg());
+                        if (StringUtils.isNotBlank(largeUnit.getUnitCode())){
+                        lqw.eq(LargeUnit::getUnitCode ,largeUnit.getUnitCode());
                     }
-                        if (StringUtils.isNotBlank(largeUnit.getAppName())){
-                        lqw.like(LargeUnit::getAppName ,largeUnit.getAppName());
+                        if (StringUtils.isNotBlank(largeUnit.getUnitName())){
+                        lqw.like(LargeUnit::getUnitName ,largeUnit.getUnitName());
                     }
         return lqw;
     }

project-zcustom/src/main/resources/mapper/zcustom/unit/LargeIssueMapper.xml

@@ -4,10 +4,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.project.zcustom.mapper.unit.LargeIssueMapper">
 
-    <resultMap type="LargeIssue" id="LargeIssueResult">
+    <resultMap type="com.project.zcustom.domain.unit.LargeIssue" id="LargeIssueResult">
         <result property="id"    column="id"    />
         <result property="description"    column="description"    />
         <result property="projectId"    column="project_id"    />
+        <result property="projectName"    column="project_name"    />
         <result property="status"    column="status"    />
         <result property="delFlag"    column="del_flag"    />
         <result property="createBy"    column="create_by"    />
@@ -21,17 +22,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectLargeIssueList" parameterType="LargeIssue" resultMap="LargeIssueResult">
-        <include refid="selectLargeIssueVo"/>
+        select a.*, b.project_name
+        from large_issue a
+        left join large_project b
+        on a.project_id = b.id
         <where>
             <if test="description != null  and description != ''"> and description = #{description}</if>
-            <if test="projectId != null "> and project_id = #{projectId}</if>
+            <if test="projectId != null "> and a.project_id = #{projectId}</if>
             <if test="status != null  and status != ''"> and status = #{status}</if>
         </where>
     </select>
 
     <select id="selectLargeIssueById" parameterType="Long" resultMap="LargeIssueResult">
-        <include refid="selectLargeIssueVo"/>
-        where id = #{id}
+        select a.*, b.project_name
+        from large_issue a
+        left join large_project b
+        on a.project_id = b.id
+        where a.id = #{id}
     </select>
 
     <insert id="insertLargeIssue" parameterType="LargeIssue">

project-zcustom/src/main/resources/mapper/zcustom/unit/LargeUnitMapper.xml

@@ -12,19 +12,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
-        <result property="appOrg"    column="app_org"    />
-        <result property="appName"    column="app_name"    />
+        <result property="unitCode"    column="unit_code"    />
+        <result property="unitName"    column="unit_name"    />
+        <result property="parentUnitCode"    column="parent_unit_code"    />
     </resultMap>
 
     <sql id="selectLargeUnitVo">
-        select id, del_flag, create_by, create_time, update_by, update_time, app_org, app_name from large_plat_app_org
+        select id, del_flag, connect_flag, create_by, create_time, update_by, update_time, unit_name, unit_code, parent_unit_code from large_unit
     </sql>
 
     <select id="selectLargeUnitList" parameterType="LargeUnit" resultMap="LargeUnitResult">
         <include refid="selectLargeUnitVo"/>
         <where>
-            <if test="appOrg != null  and appOrg != ''"> and app_org = #{appOrg}</if>
-            <if test="appName != null  and appName != ''"> and app_name like concat('%', #{appName}, '%')</if>
+            <if test="unitCode != null  and unitCode != ''"> and unit_code = #{unitCode}</if>
+            <if test="unitName != null  and unitName != ''"> and unit_name like concat('%', #{unitName}, '%')</if>
         </where>
     </select>
 
@@ -34,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <insert id="insertLargeUnit" parameterType="LargeUnit" useGeneratedKeys="true" keyProperty="id">
-        insert into large_plat_app_org
+        insert into large_unit
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="delFlag != null">del_flag,</if>
             <if test="createBy != null">create_by,</if>
@@ -56,7 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
 
     <update id="updateLargeUnit" parameterType="LargeUnit">
-        update large_plat_app_org
+        update large_unit
         <trim prefix="SET" suffixOverrides=",">
             <if test="delFlag != null">del_flag = #{delFlag},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
@@ -70,21 +71,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteLargeUnitById" parameterType="Long">
-        delete from large_plat_app_org where id = #{id}
+        delete from large_unit where id = #{id}
     </delete>
 
     <delete id="deleteLargeUnitByIds" parameterType="String">
-        delete from large_plat_app_org where id in
+        delete from large_unit where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
     </delete>
     <delete id="reallyDeleteByWrapper">
-        DELETE FROM large_plat_app_org ${ew.customSqlSegment}
+        DELETE FROM large_unit ${ew.customSqlSegment}
     </delete>
 
     <select id="getConnectUnitNum" resultType="int">
-        select count(*) from large_plat_app_org
+        select count(*) from large_unit
         where connect_flag = '0' and del_flag = '0'
     </select>
 
@@ -101,7 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
             `large_camera` a
                 LEFT JOIN large_project b ON a.project_id = b.id
-                LEFT JOIN large_plat_app_org c ON b.unit_id = c.app_org
+                LEFT JOIN large_unit c ON b.unit_id = c.app_org
         GROUP BY
             c.app_org
     </select>
@@ -119,7 +120,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
             `large_camera` a
                 LEFT JOIN large_project b ON a.project_id = b.id
-                LEFT JOIN large_plat_app_org c ON b.unit_id = c.app_org
+                LEFT JOIN large_unit c ON b.unit_id = c.app_org
         WHERE
             c.app_org = #{appOrg}
     </select>