20241224_sun

pom.xml

@@ -50,7 +50,7 @@
                 <!-- 环境标识，需要与配置文件的名称相对应 -->
                 <profiles.active>dev</profiles.active>
                 <!--                <nacos.server>121.36.73.159:8848</nacos.server>-->
-                <nacos.server>121.36.73.159:848</nacos.server>
+                <nacos.server>10.16.4.12:8848</nacos.server>
                 <!--                <nacos.server>mz.tshe.cn:848</nacos.server>-->
                 <nacos.config.user>nacos</nacos.config.user>
                 <nacos.config.password>sckjadmin</nacos.config.password>

ruoyi-modules/mz-gljt/src/main/java/com/ruoyi/gljt/controller/GljtQxpzController.java

@@ -0,0 +1,106 @@
+package com.ruoyi.gljt.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.system.validate.group.AddGroup;
+import com.ruoyi.gljt.domain.GljtQxpz;
+import com.ruoyi.gljt.service.IGljtQxpzService;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+
+/**
+ * 高龄津贴_区县配置信息Controller
+ * 
+ * @author sun
+ * @date 2024-12-24
+ */
+@RestController
+@RequestMapping("/qxpz")
+public class GljtQxpzController extends BaseController
+{
+    @Autowired
+    private IGljtQxpzService gljtQxpzService;
+
+    /**
+     * 查询高龄津贴_区县配置信息列表
+     */
+    @RequiresPermissions("gljt:qxpz:list")
+    @GetMapping("/list")
+    public TableDataInfo list(GljtQxpz gljtQxpz)
+    {
+        startPage();
+        List<GljtQxpz> list = gljtQxpzService.selectGljtQxpzList(gljtQxpz);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出高龄津贴_区县配置信息列表
+     */
+    @RequiresPermissions("gljt:qxpz:export")
+    @Log(title = "高龄津贴_区县配置信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, GljtQxpz gljtQxpz)
+    {
+        List<GljtQxpz> list = gljtQxpzService.selectGljtQxpzList(gljtQxpz);
+        ExcelUtil<GljtQxpz> util = new ExcelUtil<GljtQxpz>(GljtQxpz.class);
+        util.exportExcel(response, list, "高龄津贴_区县配置信息数据");
+    }
+
+    /**
+     * 获取高龄津贴_区县配置信息详细信息
+     */
+    @RequiresPermissions("gljt:qxpz:query")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return AjaxResult.success(gljtQxpzService.selectGljtQxpzById(id));
+    }
+
+    /**
+     * 新增高龄津贴_区县配置信息
+     */
+    @RequiresPermissions("gljt:qxpz:add")
+    @Log(title = "高龄津贴_区县配置信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@Validated({AddGroup.class}) @RequestBody GljtQxpz gljtQxpz)
+    {
+        return toAjax(gljtQxpzService.insertGljtQxpz(gljtQxpz),gljtQxpz.getId());
+    }
+
+    /**
+     * 修改高龄津贴_区县配置信息
+     */
+    @RequiresPermissions("gljt:qxpz:edit")
+    @Log(title = "高龄津贴_区县配置信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody GljtQxpz gljtQxpz)
+    {
+        return toAjax(gljtQxpzService.updateGljtQxpz(gljtQxpz));
+    }
+
+    /**
+     * 删除高龄津贴_区县配置信息
+     */
+    @RequiresPermissions("gljt:qxpz:remove")
+    @Log(title = "高龄津贴_区县配置信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(gljtQxpzService.deleteGljtQxpzByIds(ids));
+    }
+}

ruoyi-modules/mz-gljt/src/main/java/com/ruoyi/gljt/domain/GljtQxpz.java

@@ -0,0 +1,154 @@
+package com.ruoyi.gljt.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.annotation.Excel;
+import com.ruoyi.common.core.web.domain.BaseEntity;
+import com.ruoyi.system.validate.DictV;
+import com.ruoyi.system.validate.group.AddGroup;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+
+/**
+ * 高龄津贴_区县配置信息对象 gljt_qxpz
+ *
+ * @author sun
+ * @date 2024-12-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
+@TableName("gljt_qxpz")
+@ApiModel("高龄津贴_区县配置信息")
+public class GljtQxpz extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    @Excel(name = "主键")
+    @TableId(value = "id",type = IdType.ASSIGN_UUID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+
+    /** 所属区划 */
+    @Excel(name = "所属区划")
+    @ApiModelProperty(value = "所属区划", required = true)
+    @NotBlank(message = "{所属区划}",groups = AddGroup.class)
+    private String xzqh;
+
+    /** 公众号登录 */
+    @Excel(name = "公众号登录")
+    @ApiModelProperty(value = "公众号登录")
+    @DictV(type = "CZ035",message = "{公众号登录}")
+    private String gzhdl;
+
+    /** 公众号注册 */
+    @Excel(name = "公众号注册")
+    @ApiModelProperty(value = "公众号注册")
+    @DictV(type = "CZ035",message = "{公众号注册}")
+    private String gzhzc;
+
+    /** 公众号申报健康状况 */
+    @Excel(name = "公众号申报健康状况")
+    @ApiModelProperty(value = "公众号申报健康状况")
+    @DictV(type = "CZ035",message = "{公众号申报健康状况}")
+    private String gzhsb;
+
+    /** 公众号申请高龄津贴 */
+    @Excel(name = "公众号申请高龄津贴")
+    @ApiModelProperty(value = "公众号申请高龄津贴")
+    @DictV(type = "CZ035",message = "{公众号申请高龄津贴}")
+    private String gzhsq;
+
+    /** 本区划健康状况检测频率（月/次） */
+    @Excel(name = "本区划健康状况检测频率", dictType = "月/次")
+    @ApiModelProperty(value = "本区划健康状况检测频率（月/次）")
+    @Size(max = 2, message = "{本区划健康状况检测频率}")
+    private String jcpc;
+
+    /** 高龄津贴申请审核流程 */
+    @Excel(name = "高龄津贴申请审核流程")
+    @ApiModelProperty(value = "高龄津贴申请审核流程")
+    private String sqshlc;
+
+    /** 高龄津贴停发审核流程 */
+    @Excel(name = "高龄津贴停发审核流程")
+    @ApiModelProperty(value = "高龄津贴停发审核流程")
+    private String tfshlc;
+
+    /** 高龄津贴补发审核流程 */
+    @Excel(name = "高龄津贴补发审核流程")
+    @ApiModelProperty(value = "高龄津贴补发审核流程")
+    private String bfshlc;
+
+    /** 高龄津贴追缴审核流程 */
+    @Excel(name = "高龄津贴追缴审核流程")
+    @ApiModelProperty(value = "高龄津贴追缴审核流程")
+    private String zjshlc;
+
+    /** 银行账户变更审核流程 */
+    @Excel(name = "银行账户变更审核流程")
+    @ApiModelProperty(value = "银行账户变更审核流程")
+    private String bgshlc;
+
+    /** 扩展字段 */
+    @Excel(name = "扩展字段")
+    @ApiModelProperty(value = "扩展字段")
+    @Size(max = 20, message = "{扩展字段}")
+    private String kz1;
+
+    /** 扩展字段 */
+    @Excel(name = "扩展字段")
+    @ApiModelProperty(value = "扩展字段")
+    @Size(max = 20, message = "{扩展字段}")
+    private String kz2;
+
+    /** 扩展字段 */
+    @Excel(name = "扩展字段")
+    @ApiModelProperty(value = "扩展字段")
+    @Size(max = 20, message = "{扩展字段}")
+    private String kz3;
+
+    /** 扩展字段 */
+    @Excel(name = "扩展字段")
+    @ApiModelProperty(value = "扩展字段")
+    @Size(max = 20, message = "{扩展字段}")
+    private String kz4;
+
+    /** 扩展字段 */
+    @Excel(name = "扩展字段")
+    @ApiModelProperty(value = "扩展字段")
+    @Size(max = 20, message = "{扩展字段}")
+    private String kz5;
+
+    /** 扩展字段 */
+    @Excel(name = "扩展字段")
+    @ApiModelProperty(value = "扩展字段")
+    @Size(max = 20, message = "{扩展字段}")
+    private String kz6;
+
+    /** 扩展字段 */
+    @Excel(name = "扩展字段")
+    @ApiModelProperty(value = "扩展字段")
+    @Size(max = 20, message = "{扩展字段}")
+    private String kz7;
+
+    /** 扩展字段 */
+    @Excel(name = "扩展字段")
+    @ApiModelProperty(value = "扩展字段")
+    @Size(max = 20, message = "{扩展字段}")
+    private String kz8;
+
+    /** 扩展字段 */
+    @Excel(name = "扩展字段")
+    @ApiModelProperty(value = "扩展字段")
+    @Size(max = 20, message = "{扩展字段}")
+    private String kz9;
+}

ruoyi-modules/mz-gljt/src/main/java/com/ruoyi/gljt/mapper/GljtQxpzMapper.java

@@ -0,0 +1,15 @@
+package com.ruoyi.gljt.mapper;
+
+import java.util.List;
+import com.ruoyi.gljt.domain.GljtQxpz;
+import com.ruoyi.common.datascope.utils.BaseMapperPlus;
+
+/**
+ * 高龄津贴_区县配置信息Mapper接口
+ * 
+ * @author sun
+ * @date 2024-12-24
+ */
+public interface GljtQxpzMapper extends BaseMapperPlus<GljtQxpz> {
+
+}

ruoyi-modules/mz-gljt/src/main/java/com/ruoyi/gljt/service/IGljtQxpzService.java

@@ -0,0 +1,54 @@
+package com.ruoyi.gljt.service;
+
+import java.util.List;
+import com.ruoyi.gljt.domain.GljtQxpz;
+
+/**
+ * 高龄津贴_区县配置信息Service接口
+ * 
+ * @author sun
+ * @date 2024-12-24
+ */
+public interface IGljtQxpzService 
+{
+    /**
+     * 查询高龄津贴_区县配置信息
+     * 
+     * @param id 高龄津贴_区县配置信息主键
+     * @return 高龄津贴_区县配置信息
+     */
+    public GljtQxpz selectGljtQxpzById(String id);
+
+    /**
+     * 查询高龄津贴_区县配置信息列表
+     * 
+     * @param gljtQxpz 高龄津贴_区县配置信息
+     * @return 高龄津贴_区县配置信息集合
+     */
+    public List<GljtQxpz> selectGljtQxpzList(GljtQxpz gljtQxpz);
+
+    /**
+     * 新增高龄津贴_区县配置信息
+     * 
+     * @param gljtQxpz 高龄津贴_区县配置信息
+     * @return 结果
+     */
+    public int insertGljtQxpz(GljtQxpz gljtQxpz);
+
+    /**
+     * 修改高龄津贴_区县配置信息
+     * 
+     * @param gljtQxpz 高龄津贴_区县配置信息
+     * @return 结果
+     */
+    public int updateGljtQxpz(GljtQxpz gljtQxpz);
+
+    /**
+     * 批量删除高龄津贴_区县配置信息
+     * 
+     * @param ids 需要删除的高龄津贴_区县配置信息主键集合
+     * @return 结果
+     */
+    public int deleteGljtQxpzByIds(String[] ids);
+
+}

ruoyi-modules/mz-gljt/src/main/java/com/ruoyi/gljt/service/impl/GljtQxpzServiceImpl.java

@@ -0,0 +1,100 @@
+package com.ruoyi.gljt.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ruoyi.common.core.exception.ServiceException;
+import com.ruoyi.common.security.utils.SysDeptJlUtils;
+import com.ruoyi.gljt.domain.GljtQxpz;
+import com.ruoyi.gljt.mapper.GljtQxpzMapper;
+import com.ruoyi.gljt.service.IGljtQxpzService;
+import com.ruoyi.system.mapper.SysDeptJlMapper;
+import org.apache.commons.lang3.ObjectUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 高龄津贴_区县配置信息Service业务层处理
+ *
+ * @author sun
+ * @date 2024-12-24
+ */
+@Service
+public class GljtQxpzServiceImpl implements IGljtQxpzService
+{
+    @Autowired
+    private GljtQxpzMapper gljtQxpzMapper;
+
+    @Autowired
+    private SysDeptJlMapper sysDeptJlMapper;
+
+    /**
+     * 查询高龄津贴_区县配置信息
+     *
+     * @param id 高龄津贴_区县配置信息主键
+     * @return 高龄津贴_区县配置信息
+     */
+    @Override
+    public GljtQxpz selectGljtQxpzById(String id) {
+        GljtQxpz res = gljtQxpzMapper.selectById(id);
+        res.setXzqh(sysDeptJlMapper.getXzqhCodes(res.getXzqh()));
+        return res;
+    }
+
+    /**
+     * 查询高龄津贴_区县配置信息列表
+     *
+     * @param gljtQxpz 高龄津贴_区县配置信息
+     * @return 高龄津贴_区县配置信息
+     */
+    @Override
+    public List<GljtQxpz> selectGljtQxpzList(GljtQxpz gljtQxpz) {
+        List<GljtQxpz> res = gljtQxpzMapper.selectList(new LambdaQueryWrapper<>(gljtQxpz));
+        res.forEach(r -> r.setXzqh(SysDeptJlUtils.getDeptCache(r.getXzqh())));
+        return res;
+    }
+
+    /**
+     * 新增高龄津贴_区县配置信息
+     *
+     * @param gljtQxpz 高龄津贴_区县配置信息
+     * @return 结果
+     */
+    @Override
+    public int insertGljtQxpz(GljtQxpz gljtQxpz) {
+        if (ObjectUtils.isNotEmpty(gljtQxpzMapper.selectOne(new LambdaQueryWrapper<GljtQxpz>()
+                .eq(GljtQxpz::getXzqh, gljtQxpz.getXzqh())))) {
+            throw new ServiceException("已经存在该区划数据，请去修改该区划数据或删除");
+        }
+        return gljtQxpzMapper.insert(gljtQxpz);
+    }
+
+    /**
+     * 修改高龄津贴_区县配置信息
+     *
+     * @param gljtQxpz 高龄津贴_区县配置信息
+     * @return 结果
+     */
+    @Override
+    public int updateGljtQxpz(GljtQxpz gljtQxpz) {
+        if (ObjectUtils.isNotEmpty(gljtQxpzMapper.selectOne(new LambdaQueryWrapper<GljtQxpz>()
+                .eq(GljtQxpz::getXzqh, gljtQxpz.getXzqh()).ne(GljtQxpz::getId, gljtQxpz.getId())))) {
+            throw new ServiceException("已经存在该区划数据，请去修改该区划数据或删除");
+        }
+        return gljtQxpzMapper.updateById(gljtQxpz);
+    }
+
+    /**
+     * 批量删除高龄津贴_区县配置信息
+     *
+     * @param ids 需要删除的高龄津贴_区县配置信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteGljtQxpzByIds(String[] ids)
+    {
+        return gljtQxpzMapper.deleteBatchIds(Arrays.asList(ids));
+    }
+
+}

ruoyi-modules/mz-gljt/src/main/resources/mapper/gljt/GljtQxpzMapper.xml

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.gljt.mapper.GljtQxpzMapper">
+    
+    <resultMap type="GljtQxpz" id="GljtQxpzResult">
+        <result property="id"    column="id"    />
+        <result property="xzqh"    column="xzqh"    />
+        <result property="gzhdl"    column="gzhdl"    />
+        <result property="gzhzc"    column="gzhzc"    />
+        <result property="gzhsb"    column="gzhsb"    />
+        <result property="gzhsq"    column="gzhsq"    />
+        <result property="jcpc"    column="jcpc"    />
+        <result property="sqshlc"    column="sqshlc"    />
+        <result property="tfshlc"    column="tfshlc"    />
+        <result property="bfshlc"    column="bfshlc"    />
+        <result property="zjshlc"    column="zjshlc"    />
+        <result property="bgshlc"    column="bgshlc"    />
+        <result property="kz1"    column="kz1"    />
+        <result property="kz2"    column="kz2"    />
+        <result property="kz3"    column="kz3"    />
+        <result property="kz4"    column="kz4"    />
+        <result property="kz5"    column="kz5"    />
+        <result property="kz6"    column="kz6"    />
+        <result property="kz7"    column="kz7"    />
+        <result property="kz8"    column="kz8"    />
+        <result property="kz9"    column="kz9"    />
+        <result property="createTimeStr"    column="create_time_str"    />
+        <result property="createUserId"    column="create_user_id"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createUserType"    column="create_user_type"    />
+        <result property="createUnit"    column="create_unit"    />
+        <result property="createTounit"    column="create_tounit"    />
+        <result property="createBmjsc"    column="create_bmjsc"    />
+        <result property="createQhjsc"    column="create_qhjsc"    />
+        <result property="createUnitName"    column="create_unit_name"    />
+        <result property="createAreaCode"    column="create_area_code"    />
+        <result property="updateTimeStr"    column="update_time_str"    />
+        <result property="updateUserId"    column="update_user_id"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateUnit"    column="update_unit"    />
+        <result property="updateUnitName"    column="update_unit_name"    />
+        <result property="state"    column="state"    />
+    </resultMap>
+
+</mapper>

ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTableColumn.java

@@ -338,7 +338,7 @@ public class GenTableColumn extends BaseEntity
         return StringUtils.equalsAnyIgnoreCase(javaField,
                 // BaseEntity
                 "createBy", "createTime", "updateBy", "updateTime", "remark",
-                "createTimeStr","createUserId","createUnit","createAreaCode","createTounit","create_bmjsc","create_qhjsc","createUnitName","createUserType",
+                "createTimeStr","createUserId","createUnit","createAreaCode","createTounit","createBmjsc","createQhjsc","createUnitName","createUserType",
                 "updateTimeStr","updateUserId","updateUnit","updateUnitName",
                 //养老机构Id 界面上基本无用
                 "jgId",

ruoyi-modules/ruoyi-gen/src/main/resources/vm_mz/java/domain.java.vm

@@ -14,6 +14,7 @@ import ${import};
 import com.ruoyi.common.core.annotation.Excel;
 #if($table.crud)
 import com.ruoyi.system.validate.group.AddGroup;
+import com.ruoyi.common.core.web.domain.BaseEntity;
 import org.hibernate.validator.constraints.Range;
 import com.ruoyi.system.validate.DictV;
 import com.ruoyi.system.validate.DateV;
@@ -103,7 +104,6 @@ public class ${ClassName} extends ${Entity}
 #else
     @Size(max = $columnIndex, message = "{$comment}")
 #end
-
 #end
 #elseif($column.javaType == 'Long' || $column.javaType == 'Integer')
     @Range(min=0,max=100,message = "{$comment}")

ruoyi-modules/ruoyi-gen/src/main/resources/vm_mz/vue/index.vue.vm

@@ -173,7 +173,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -183,8 +183,8 @@
     />
 
     <!-- 添加或修改${functionName}对话框 -->
-    <el-dialog v-dialog-drag :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+    <el-dialog v-dialog-drag :title="title" :visible.sync="open" width="600px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
 #foreach($column in $columns)
 #set($field=$column.javaField)
 #if($column.insert && !$column.pk)
@@ -488,7 +488,7 @@
       get${BusinessName}(${pkColumn.javaField}).then(response => {
         this.form = response.data;
         /****** sks 需要改动的地方 start ******/
-        this.copyForm=this.deepCopy(response.data)
+        // this.copyForm=this.deepCopy(response.data)
         /****** sks 需要改动的地方 end ******/
 #foreach ($column in $columns)
 #if($column.htmlType == "checkbox")
@@ -511,32 +511,32 @@
           this.submitFormLoading = true;
           if (this.form.${pkColumn.javaField} != null) {
             /****** sks 需要改动的地方 start ******/
-            let formData=this.comparisonObject(this.form,this.copyForm);
-            if(formData) {
-              update${BusinessName}({...formData,id:this.form.id}).then(response => {
+            // let formData=this.comparisonObject(this.form,this.copyForm);
+            // if(formData) {
+              update${BusinessName}(this.form).then(response => {
                 this.#[[$modal]]#.msgSuccess("修改成功");
                 this.open = false;
-                this.${businessName}List=this.dataReplacement(this.${businessName}List,this.form.id,formData);
-                // this.getList();
+                // this.${businessName}List=this.dataReplacement(this.${businessName}List,this.form.id,formData);
+                this.getList();
               }).finally(()=>this.submitFormLoading =false);
-            }else{
-              this.#[[$modal]]#.msgSuccess("修改成功");
-              this.open = false;
-              this.submitFormLoading = false;
-            }
+            // }else{
+            //   this.#[[$modal]]#.msgSuccess("修改成功");
+            //   this.open = false;
+            //   this.submitFormLoading = false;
+            // }
             /****** sks 需要改动的地方 end ******/
           } else {
             add${BusinessName}(this.form).then(response => {
               this.#[[$modal]]#.msgSuccess("新增成功");
               this.open = false;
-              // this.getList();
+              this.getList();
               /****** sks 需要改动的地方 start ******/
-              if (this.queryParams.pageSize===this.${businessName}List.length)
-              {
-                this.${businessName}List.pop();
-              }
-              this.${businessName}List.unshift({...this.form,id:response.data});
-              this.total++;
+              // if (this.queryParams.pageSize===this.${businessName}List.length)
+              // {
+              //   this.${businessName}List.pop();
+              // }
+              // this.${businessName}List.unshift({...this.form,id:response.data});
+              // this.total++;
               /****** sks 需要改动的地方 end ******/
             }).finally(()=>this.submitFormLoading =false);
           }
@@ -550,15 +550,15 @@
       this.#[[$modal]]#.confirm('确认删除' + this.changeDelData(row,'id','ID值',xh) + '的记录？').then(function() {
         return del${BusinessName}(${pkColumn.javaField}s);
       }).then(() => {
-        // this.getList();
+        this.getList();
         /****** sks 需要改动的地方 ind参数需要传进来 start ******/
-        this.${businessName}List.splice(index,1);
-        if(this.${businessName}List.length===0)
-        {
-          this.getList();
-        }else {
-          this.total--;
-        }
+        // this.${businessName}List.splice(index,1);
+        // if(this.${businessName}List.length===0)
+        // {
+        //   this.getList();
+        // }else {
+        //   this.total--;
+        // }
         this.#[[$modal]]#.msgSuccess("删除成功");
         /****** sks 需要改动的地方 end ******/
       }).catch(() => {});

ruoyi-ui/src/api/gljt/qxpz.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询高龄津贴_区县配置信息列表
+export function listQxpz(query) {
+  return request({
+    url: '/gljt/qxpz/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询高龄津贴_区县配置信息详细
+export function getQxpz(id) {
+  return request({
+    url: '/gljt/qxpz/' + id,
+    method: 'get'
+  })
+}
+
+// 新增高龄津贴_区县配置信息
+export function addQxpz(data) {
+  return request({
+    url: '/gljt/qxpz',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改高龄津贴_区县配置信息
+export function updateQxpz(data) {
+  return request({
+    url: '/gljt/qxpz',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除高龄津贴_区县配置信息
+export function delQxpz(id) {
+  return request({
+    url: '/gljt/qxpz/' + id,
+    method: 'delete'
+  })
+}

ruoyi-ui/src/views/gljt/qxpz/index.vue

@@ -0,0 +1,429 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="所属区划" prop="xzqh">
+        <RegionCascaderSelect :endLevel="2" v-model="xzqh" style="width: 100%" valueProp="code" >
+        </RegionCascaderSelect>
+<!--        <el-input v-model="queryParams.xzqh" placeholder="请输入所属区划" clearable @keyup.enter.native="handleQuery" />-->
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['gljt:qxpz:add']">新增</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="qxpzList">
+      <el-table-column label="序号" align="center">
+        <template slot-scope="scope">
+          {{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}
+        </template>
+      </el-table-column>
+      <el-table-column label="所属区划" align="center" prop="xzqh" />
+      <el-table-column label="公众号登录" align="center" prop="gzhdl">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.CZ035" :value="scope.row.gzhdl" />
+        </template>
+      </el-table-column>
+      <el-table-column label="公众号注册" align="center" prop="gzhzc">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.CZ035" :value="scope.row.gzhzc" />
+        </template>
+      </el-table-column>
+      <el-table-column label="公众号申报健康状况" align="center" prop="gzhsb">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.CZ035" :value="scope.row.gzhsb" />
+        </template>
+      </el-table-column>
+      <el-table-column label="公众号申请高龄津贴" align="center" prop="gzhsq">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.CZ035" :value="scope.row.gzhsq" />
+        </template>
+      </el-table-column>
+      <el-table-column label="本区划健康状况检测频率" align="center" prop="jcpc" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['gljt:qxpz:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row, scope.$index)"
+            v-hasPermi="['gljt:qxpz:remove']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
+
+    <!-- 添加或修改高龄津贴_区县配置信息对话框 -->
+    <el-dialog v-dialog-drag :title="title" :visible.sync="open" width="600px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="180px">
+
+        <el-form-item label="所属区划" prop="xzqh">
+          <RegionCascaderSelect :endLevel="2" v-model="form.xzqh" style="width: 100%" valueProp="code" >
+            </RegionCascaderSelect>
+        </el-form-item>
+
+        <el-form-item label="公众号登录" prop="gzhdl">
+          <el-select v-model="form.gzhdl" placeholder="请选择公众号登录" style="width: 100%">
+            <el-option v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.label"
+              :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="公众号注册" prop="gzhzc">
+          <el-select v-model="form.gzhzc" placeholder="请选择公众号注册" style="width: 100%">
+            <el-option v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.label"
+              :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="公众号申报健康状况" prop="gzhsb">
+          <el-select v-model="form.gzhsb" placeholder="请选择公众号申报健康状况" style="width: 100%">
+            <el-option v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.label"
+              :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="公众号申请高龄津贴" prop="gzhsq">
+          <el-select v-model="form.gzhsq" placeholder="请选择公众号申请高龄津贴" style="width: 100%">
+            <el-option v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.label"
+              :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="本区划健康状况检测频率" prop="jcpc">
+          <el-input v-model="form.jcpc" placeholder="请输入本区划健康状况检测频率" />
+        </el-form-item>
+
+        <el-form-item label="高龄津贴申请审核流程" prop="sqshlc">
+          <el-select v-model="form.sqshlc" placeholder="请选择高龄津贴申请审核流程" style="width: 100%">
+            <el-option v-for="dict in dict.type.GL001" :key="dict.value" :label="dict.label"
+              :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="高龄津贴停发审核流程" prop="tfshlc">
+          <el-select v-model="form.tfshlc" placeholder="请选择高龄津贴停发审核流程" style="width: 100%">
+            <el-option v-for="dict in dict.type.GL001" :key="dict.value" :label="dict.label"
+              :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="高龄津贴补发审核流程" prop="bfshlc">
+          <el-select v-model="form.bfshlc" placeholder="请选择高龄津贴补发审核流程" style="width: 100%">
+            <el-option v-for="dict in dict.type.GL001" :key="dict.value" :label="dict.label"
+              :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="高龄津贴追缴审核流程" prop="zjshlc">
+          <el-select v-model="form.zjshlc" placeholder="请选择高龄津贴追缴审核流程" style="width: 100%">
+            <el-option v-for="dict in dict.type.GL001" :key="dict.value" :label="dict.label"
+              :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="银行账户变更审核流程" prop="bgshlc">
+          <el-select v-model="form.bgshlc" placeholder="请选择银行账户变更审核流程" style="width: 100%">
+            <el-option v-for="dict in dict.type.GL001" :key="dict.value" :label="dict.label"
+              :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="扩展字段" prop="kz1">
+          <el-input v-model="form.kz1" placeholder="请输入扩展字段" />
+        </el-form-item>
+
+        <el-form-item label="扩展字段" prop="kz2">
+          <el-input v-model="form.kz2" placeholder="请输入扩展字段" />
+        </el-form-item>
+
+        <el-form-item label="扩展字段" prop="kz3">
+          <el-input v-model="form.kz3" placeholder="请输入扩展字段" />
+        </el-form-item>
+
+        <el-form-item label="扩展字段" prop="kz4">
+          <el-input v-model="form.kz4" placeholder="请输入扩展字段" />
+        </el-form-item>
+
+        <el-form-item label="扩展字段" prop="kz5">
+          <el-input v-model="form.kz5" placeholder="请输入扩展字段" />
+        </el-form-item>
+
+        <el-form-item label="扩展字段" prop="kz6">
+          <el-input v-model="form.kz6" placeholder="请输入扩展字段" />
+        </el-form-item>
+
+        <el-form-item label="扩展字段" prop="kz7">
+          <el-input v-model="form.kz7" placeholder="请输入扩展字段" />
+        </el-form-item>
+
+        <el-form-item label="扩展字段" prop="kz8">
+          <el-input v-model="form.kz8" placeholder="请输入扩展字段" />
+        </el-form-item>
+
+        <el-form-item label="扩展字段" prop="kz9">
+          <el-input v-model="form.kz9" placeholder="请输入扩展字段" />
+        </el-form-item>
+
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm" :loading="submitFormLoading">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { addQxpz, delQxpz, getQxpz, listQxpz, updateQxpz } from "@/api/gljt/qxpz";
+import { chineseOne, idCard, Regular } from '@/utils/regular'
+
+export default {
+  name: "Qxpz",
+  dicts: ['CZ035','GL001'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      submitFormLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 高龄津贴_区县配置信息表格数据
+      xzqh: [],
+      qxpzList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        xzqh: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        xzqh: [
+          { required: true, message: "所属区划不能为空", trigger: "blur" },
+          // { max: 12, message: '所属区划不能超过12个字符', trigger: 'blur' },
+        ],
+        jcpc: [
+          { max: 2, message: '本区划健康状况检测频率不能超过2个字符', trigger: 'blur' },
+        ],
+        kz1: [
+          { max: 20, message: '扩展字段不能超过20个字符', trigger: 'blur' },
+        ],
+        kz2: [
+          { max: 20, message: '扩展字段不能超过20个字符', trigger: 'blur' },
+        ],
+        kz3: [
+          { max: 20, message: '扩展字段不能超过20个字符', trigger: 'blur' },
+        ],
+        kz4: [
+          { max: 20, message: '扩展字段不能超过20个字符', trigger: 'blur' },
+        ],
+        kz5: [
+          { max: 20, message: '扩展字段不能超过20个字符', trigger: 'blur' },
+        ],
+        kz6: [
+          { max: 20, message: '扩展字段不能超过20个字符', trigger: 'blur' },
+        ],
+        kz7: [
+          { max: 20, message: '扩展字段不能超过20个字符', trigger: 'blur' },
+        ],
+        kz8: [
+          { max: 20, message: '扩展字段不能超过20个字符', trigger: 'blur' },
+        ],
+        kz9: [
+          { max: 20, message: '扩展字段不能超过20个字符', trigger: 'blur' },
+        ],
+        createBmjsc: [
+          { max: 60, message: '部门检索串不能超过60个字符', trigger: 'blur' },
+        ],
+        createQhjsc: [
+          { max: 80, message: '区划检索串不能超过80个字符', trigger: 'blur' },
+        ],
+        state: [
+          { required: true, message: "数据状态不能为空", trigger: "blur" },
+        ]
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询高龄津贴_区县配置信息列表 */
+    getList() {
+      this.loading = true;
+      listQxpz(this.queryParams).then(response => {
+        this.qxpzList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.submitFormLoading = false;
+      this.form = {
+        id: null,
+        xzqh: null,
+        gzhdl: null,
+        gzhzc: null,
+        gzhsb: null,
+        gzhsq: null,
+        jcpc: null,
+        sqshlc: null,
+        tfshlc: null,
+        bfshlc: null,
+        zjshlc: null,
+        bgshlc: null,
+        kz1: null,
+        kz2: null,
+        kz3: null,
+        kz4: null,
+        kz5: null,
+        kz6: null,
+        kz7: null,
+        kz8: null,
+        kz9: null,
+        state: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      if (this.xzqh) {
+        this.queryParams.xzqh = this.xzqh[this.xzqh.length - 1]
+      }
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.queryParams.xzqh = null;
+      this.xzqh = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加高龄津贴_区县配置信息";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getQxpz(id).then(response => {
+        this.form = response.data;
+        this.form.xzqh = JSON.stringify(this.form.xzqh.split(','))
+        /****** sks 需要改动的地方 start ******/
+        // this.copyForm = this.deepCopy(response.data)
+        /****** sks 需要改动的地方 end ******/
+        this.open = true;
+        this.title = "修改高龄津贴_区县配置信息";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          let xzqh = null;
+          if (this.form.xzqh) {
+            if (Array.isArray(this.form.xzqh)) {
+              xzqh = this.form.xzqh[this.form.xzqh.length - 1]
+            }
+          }
+          this.submitFormLoading = true;
+          if (this.form.id != null) {
+            /****** sks 需要改动的地方 start ******/
+            // let formData = this.comparisonObject(this.form, this.copyForm);
+            // if (formData) {
+              updateQxpz({...this.form, xzqh:xzqh}).then(response => {
+                this.$modal.msgSuccess("修改成功");
+                this.open = false;
+                this.qxpzList = this.dataReplacement(this.qxpzList, this.form.id, formData);
+                this.getList();
+              }).finally(() => this.submitFormLoading = false);
+            // } else {
+            //   this.$modal.msgSuccess("修改成功");
+            //   this.open = false;
+            //   this.submitFormLoading = false;
+            // }
+            /****** sks 需要改动的地方 end ******/
+          } else {
+            addQxpz({...this.form, xzqh:xzqh}).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+              /****** sks 需要改动的地方 start ******/
+              // if (this.queryParams.pageSize === this.qxpzList.length) {
+              //   this.qxpzList.pop();
+              // }
+              // this.qxpzList.unshift({ ...this.form, id: response.data });
+              // this.total++;
+              /****** sks 需要改动的地方 end ******/
+            }).finally(() => this.submitFormLoading = false);
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row, index) {
+      const ids = row.id || this.ids;
+      const xh = (this.queryParams.pageNum - 1) * this.queryParams.pageSize + index + 1;
+      this.$modal.confirm('确认删除' + this.changeDelData(row, 'id', 'ID值', xh) + '的记录？').then(function () {
+        return delQxpz(ids);
+      }).then(() => {
+        this.getList();
+        /****** sks 需要改动的地方 ind参数需要传进来 start ******/
+        // this.qxpzList.splice(index, 1);
+        // if (this.qxpzList.length === 0) {
+        //   this.getList();
+        // } else {
+        //   this.total--;
+        // }
+        // this.$modal.msgSuccess("删除成功");
+        /****** sks 需要改动的地方 end ******/
+      }).catch(() => { });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('gljt/qxpz/export', {
+        ...this.queryParams
+      }, `qxpz_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>