guoshilong
2023-06-03 695b18282b20c2bd954b3dfdcbe51bc28dc46f64
行政区划修改
6 files modified
106 ■■■■ changed files
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttAdBaseController.java 49 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttAdBase.java 17 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttAdBaseMapper.java 5 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttAdBaseMapper.xml 18 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttAdBaseService.java 7 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttAdBaseServiceImpl.java 10 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttAdBaseController.java
@@ -16,10 +16,8 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.node.ForestNodeMerger;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springblade.core.tool.utils.ObjectUtil;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import java.util.List;
@@ -40,6 +38,37 @@
public class AttAdBaseController extends BladeController {
    private final IAttAdBaseService attAdBaseService;
    @ApiOperation(value = "中台行政区划-添加", notes = "中台行政区划-添加")
    @PostMapping(value = "/save")
    public R add(AttAdBase attAdBase) {
        return R.data(attAdBaseService.save(attAdBase));
    }
    @ApiOperation(value = "中台行政区划-修改", notes = "中台行政区划-修改")
    @PostMapping(value = "/edit")
    public R edit(AttAdBase attAdBase) {
        return R.data(attAdBaseService.updateById(attAdBase));
    }
    @ApiOperation(value = "中台行政区划-添加修改", notes = "中台行政区划-添加修改")
    @PostMapping(value = "/submit")
    public R submit(AttAdBase attAdBase) {
        return R.data(attAdBaseService.saveOrUpdate(attAdBase));
    }
    @ApiOperation(value = "中台行政区划-删除", notes = "中台行政区划-删除")
    @GetMapping(value = "/remove")
    public R edit(String guid) {
        return R.data(attAdBaseService.removeById(guid));
    }
    @ApiOperation(value = "中台行政区划-查询详情", notes = "中台行政区划-查询详情")
    @GetMapping(value = "/getDetail")
    public R getDetail(AttAdBase attAdBase) {
        AttAdBaseVO one = attAdBaseService.getDetail(attAdBase);
        return R.data(one);
    }
    @ApiOperation(value = "中台行政区划-分页列表查询", notes = "中台行政区划-分页列表查询")
    @GetMapping(value = "/list")
@@ -72,11 +101,13 @@
    })
    @ApiOperation(value = "加载树列表", notes = "传入code")
    public R<List<AttAdBaseVO>> selectAll(String parentCode, @ApiIgnore @RequestParam Map<String, Object> obj) {
        String code = obj.get("code").toString();
        if (code.substring(0,4).indexOf("00") > -1) {
            obj.put("code",code.substring(0,2));
        } else if (code.substring(0,6).indexOf("00") > -1) {
            obj.put("code",code.substring(0,4));
        if (ObjectUtil.isNotEmpty(obj.get("code"))){
            String code = obj.get("code").toString();
            if (code.substring(0,4).indexOf("00") > -1) {
                obj.put("code",code.substring(0,2));
            } else if (code.substring(0,6).indexOf("00") > -1) {
                obj.put("code",code.substring(0,4));
            }
        }
        List<AttAdBaseVO> list = attAdBaseService.lazyTreeAll(parentCode, obj);
        return R.data(listNodeLazyVO(list));
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttAdBase.java
@@ -27,6 +27,7 @@
    @JsonSerialize(using = ToStringSerializer.class)
    @ApiModelProperty(value = "主键")
    @TableField("\"guid\"")
    @TableId("\"guid\"")
    private String guid;
    /**
@@ -37,6 +38,13 @@
    private String adCode;
    /**
     * 行政区划名称
     */
    @ApiModelProperty(value = "行政区划名称")
    @TableField("\"ad_name\"")
    private String adName;
    /**
     * 父主键
     */
    @JsonSerialize(using = ToStringSerializer.class)
@@ -45,11 +53,12 @@
    private String pAdCode;
    /**
     * 行政区划名称
     * 父名称
     */
    @ApiModelProperty(value = "行政区划名称")
    @TableField("\"ad_name\"")
    private String adName;
    @JsonSerialize(using = ToStringSerializer.class)
    @ApiModelProperty(value = "父名称")
    @TableField("\"p_ad_name\"")
    private String pAdName;
    /**
     * 行政区划等级
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttAdBaseMapper.java
@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.MapKey;
import org.apache.ibatis.annotations.Param;
import org.springframework.web.bind.annotation.PostMapping;
import java.util.List;
import java.util.Map;
@@ -37,4 +38,8 @@
     * @return
     */
    List<PersonVO> getPersonListByResGuid(@Param("res_cd")String res_cd);
    AttAdBaseVO getDetail(@Param("attAdBase") AttAdBase attAdBase);
    boolean customizeSave(@Param("attAdBase") AttAdBase attAdBase);
}
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttAdBaseMapper.xml
@@ -10,6 +10,12 @@
        <result column="key" property="key"/>
        <result column="has_children" property="hasChildren"/>
    </resultMap>
    <insert id="customizeSave">
        INSERT INTO "att_ad_base"
        ("guid","ad_code","ad_name","p_ad_code","p_ad_name","ad_grad")
        VALUES
        (#{attAdBase.adCode},#{attAdBase.adCode},#{attAdBase.adName},#{attAdBase.pAdCode},#{attAdBase.pAdName},#{attAdBase.adGrad})
    </insert>
    <select id="lazyTree" resultMap="treeNodeResultMap">
        SELECT
@@ -99,5 +105,17 @@
        )
        and bu.phone is not null and bu.phone!=''
    </select>
    <select id="getDetail" resultType="cn.gistack.sm.sjztmd.vo.AttAdBaseVO">
        SELECT
            region."guid",
            region."ad_code",
            region."p_ad_code",
            region."ad_name",
            region."ad_grad",
            region."p_ad_name" AS pAdName,
            ( SELECT CASE WHEN count( 1 ) > 0 THEN 1 ELSE 0 END FROM "SJZT_MD"."att_ad_base" WHERE "p_ad_code" = region."ad_code" ) AS "has_children"
             FROM "SJZT_MD"."att_ad_base" region
             WHERE region."guid" = #{attAdBase.guid}
    </select>
</mapper>
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttAdBaseService.java
@@ -35,4 +35,11 @@
     * @return
     */
    List<PersonVO> getPersonListByResGuid(String res_cd);
    /**
     * 获取详情
     * @param attAdBase
     * @return
     */
    AttAdBaseVO getDetail(AttAdBase attAdBase);
}
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttAdBaseServiceImpl.java
@@ -78,4 +78,14 @@
    public List<PersonVO> getPersonListByResGuid(String res_cd) {
        return baseMapper.getPersonListByResGuid(res_cd);
    }
    @Override
    public AttAdBaseVO getDetail(AttAdBase attAdBase) {
        return baseMapper.getDetail(attAdBase);
    }
    @Override
    public boolean save(AttAdBase entity) {
        return baseMapper.customizeSave(entity);
    }
}