Merge remote-tracking branch 'origin/master'

base-manager/db/add.sql

@@ -357,4 +357,27 @@ CREATE TABLE `mortals_sys_social_security_set`  (
     `createUserId` bigint(20) NULL DEFAULT NULL COMMENT '创建用户',
     `updateTime` datetime(0) NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间',
     PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '社保配置表';
\ No newline at end of file
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '社保配置表';
+
+
+
+
+-- ----------------------------
+-- 2025-04-22   添加东部经开区
+-- ----------------------------
+
+INSERT INTO `mortals_sys_base_area` VALUES (null, ',16ca461e2c824257a50dd0c7fab6f2de', '达州东部经开区', 'gde17ba11bbf48568547c21b174c8a32', '16ca461e2c824257a50dd0c7fab6f2de', 'True', 'True', 'false', 'false', '511715000000', 3, '达州东部经开区', 'dzsgxjscyy.sczwfw.gov.cn', 1, '2025-03-20 10:20:10', NULL, '2025-03-20 10:20:10');
+INSERT INTO `mortals_sys_base_area` VALUES (null, ',gde17ba11bbf48568547c21b174c8a32', '麻柳镇', 'abc17ba11bbf48568547c21b174c8a32', 'gde17ba11bbf48568547c21b174c8a32', 'True', 'True', 'false', 'false', '511715026000', 4, '麻柳镇', 'dzsgxjscyy.sczwfw.gov.cn', 1, '2025-03-20 10:20:10', NULL, '2025-03-20 10:20:10');
+INSERT INTO `mortals_sys_base_area` VALUES (null, ',gde17ba11bbf48568547c21b174c8a32', '亭子镇', 'abd17ba11bbf48568547c21b174c8a32', 'gde17ba11bbf48568547c21b174c8a32', 'True', 'True', 'false', 'false', '511715114000', 4, '亭子镇', 'dzsgxjscyy.sczwfw.gov.cn', 1, '2025-03-20 10:20:10', NULL, '2025-03-20 10:20:10');
+INSERT INTO `mortals_sys_base_area` VALUES (null, ',gde17ba11bbf48568547c21b174c8a32', '福善镇', 'abe17ba11bbf48568547c21b174c8a32', 'gde17ba11bbf48568547c21b174c8a32', 'True', 'True', 'false', 'false', '511715282000', 4, '福善镇', 'dzsgxjscyy.sczwfw.gov.cn', 1, '2025-03-20 10:20:10', NULL, '2025-03-20 10:20:10');
+INSERT INTO `mortals_sys_base_area` VALUES (null, ',gde17ba11bbf48568547c21b174c8a32', '安仁乡', 'abf17ba11bbf48568547c21b174c8a32', 'gde17ba11bbf48568547c21b174c8a32', 'True', 'True', 'false', 'false', '511715414000', 4, '安仁乡', 'dzsgxjscyy.sczwfw.gov.cn', 1, '2025-03-20 10:20:10', NULL, '2025-03-20 10:20:10');
+
+
+
+
+INSERT INTO `mortals_sys_area` VALUES (null, ',16ca461e2c824257a50dd0c7fab6f2de', '达州东部经开区', 'gde17ba11bbf48568547c21b174c8a32', '16ca461e2c824257a50dd0c7fab6f2de', 'True', 'True', 'false', 'false', '511715000000', 3, '达州东部经开区', 'dzsgxjscyy.sczwfw.gov.cn', 1, '2025-03-20 10:20:10', NULL, '2025-03-20 10:20:10');
+INSERT INTO `mortals_sys_area` VALUES (null, ',gde17ba11bbf48568547c21b174c8a32', '麻柳镇', 'abc17ba11bbf48568547c21b174c8a32', 'gde17ba11bbf48568547c21b174c8a32', 'True', 'True', 'false', 'false', '511715026000', 4, '麻柳镇', 'dzsgxjscyy.sczwfw.gov.cn', 1, '2025-03-20 10:20:10', NULL, '2025-03-20 10:20:10');
+INSERT INTO `mortals_sys_area` VALUES (null, ',gde17ba11bbf48568547c21b174c8a32', '亭子镇', 'abd17ba11bbf48568547c21b174c8a32', 'gde17ba11bbf48568547c21b174c8a32', 'True', 'True', 'false', 'false', '511715114000', 4, '亭子镇', 'dzsgxjscyy.sczwfw.gov.cn', 1, '2025-03-20 10:20:10', NULL, '2025-03-20 10:20:10');
+INSERT INTO `mortals_sys_area` VALUES (null, ',gde17ba11bbf48568547c21b174c8a32', '福善镇', 'abe17ba11bbf48568547c21b174c8a32', 'gde17ba11bbf48568547c21b174c8a32', 'True', 'True', 'false', 'false', '511715282000', 4, '福善镇', 'dzsgxjscyy.sczwfw.gov.cn', 1, '2025-03-20 10:20:10', NULL, '2025-03-20 10:20:10');
+INSERT INTO `mortals_sys_area` VALUES (null, ',gde17ba11bbf48568547c21b174c8a32', '安仁乡', 'abf17ba11bbf48568547c21b174c8a32', 'gde17ba11bbf48568547c21b174c8a32', 'True', 'True', 'false', 'false', '511715414000', 4, '安仁乡', 'dzsgxjscyy.sczwfw.gov.cn', 1, '2025-03-20 10:20:10', NULL, '2025-03-20 10:20:10');
+

base-manager/src/main/java/com/mortals/xhx/base/system/oper/service/impl/OperLogServiceImpl.java

@@ -8,6 +8,7 @@
 
 package com.mortals.xhx.base.system.oper.service.impl;
 
+import cn.hutool.extra.servlet.ServletUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.mortals.framework.ap.GlobalSysInfo;
 import com.mortals.framework.ap.SysConstains;
@@ -68,7 +69,8 @@ public class OperLogServiceImpl extends AbstractCRUDServiceImpl<OperLogDao,OperL
     @Override
     public void insertOperLog(HttpServletRequest request, IUser user, BaseEntity oldEntity, BaseEntity newEntity, OperTypeEnum operType, String content, String id) {
         OperLogEntity operLogEntity = new OperLogEntity();
-        operLogEntity.setIp(HttpUtil.getRequestIP(request));
+        //operLogEntity.setIp(HttpUtil.getRequestIP(request));
+        operLogEntity.setIp( ServletUtil.getClientIP(request));
         operLogEntity.setLogDate(new Date());
 
         operLogEntity.setPlatformMark(GlobalSysInfo.getPropertyValue(SysConstains.PROP_PLATFORM_MARK));

base-manager/src/main/java/com/mortals/xhx/base/system/user/service/impl/UserServiceImpl.java

@@ -480,8 +480,8 @@ public class UserServiceImpl extends AbstractCRUDCacheServiceImpl<UserDao, UserE
         //eba467f81fb265befdf1f6ab041d39ab   原始admin密码
 
 
-        System.out.println(SecurityUtil.md5DoubleEncoding(" 123456 "));
-          System.out.println(SecurityUtil.md5DoubleEncoding("123"));
+        System.out.println(SecurityUtil.md5DoubleEncoding("wasd111623227!!@"));
+          System.out.println(SecurityUtil.md5DoubleEncoding("p@ssw0rd"));
         // System.out.println(SecurityUtil.md5DoubleEncoding("Qt123456@"));
 
 /*

base-manager/src/main/java/com/mortals/xhx/module/matter/model/MatterDatumEntity.java

@@ -28,10 +28,12 @@ public class MatterDatumEntity extends MatterDatumVo {
     /**
      * 事项名称
      */
+    @Excel(name = "事项名称")
     private String matterName;
     /**
      * 材料名
      */
+    @Excel(name = "材料名称")
     private String materialName;
     /**
      * 必交性（非必要.非必要，必要.必要，必要|容缺后补.必要|容缺后补，非必要|容缺后补.非必要|容缺后补）

base-manager/src/main/java/com/mortals/xhx/module/matter/model/vo/MatterCustomImportEntity.java

@@ -76,6 +76,13 @@ public class MatterCustomImportEntity extends BaseEntityLong {
     private String superviseShow;
 
 
+    /**
+     * 咨询方式
+     */
+    @Excel(name = "咨询方式")
+    private String cousultingShow;
+
+
     /**
      * 事项类型
      */

base-manager/src/main/java/com/mortals/xhx/module/matter/model/vo/MatterDatumVo.java

 package com.mortals.xhx.module.matter.model.vo;
+import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.matter.model.MatterDatumEntity;
 import com.mortals.xhx.module.matter.model.MatterDatumFileEntity;
@@ -19,4 +20,10 @@ public class MatterDatumVo extends BaseEntityLong {
     private List<MatterDatumFileEntity> datumFileList;
     /** 事项id列表 */
     private List <Long> matterIdList;
+
+    /**
+     * 区域编码
+     */
+    @Excel(name = "区域编码")
+    private String areaCode;
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterDatumServiceImpl.java

@@ -94,8 +94,6 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
         }
         super.updateAfter(entity, context);
     }
-
-
     /**
      * @param query
      * @param context
@@ -105,4 +103,14 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
     public List<MatterDatumEntity> findMatterList(MatterDatumEntity query, Context context) {
         return null;
     }
+
+
+    @Override
+    public String importList(List<MatterDatumEntity> list, Boolean updateSupport, Context context) {
+
+
+
+
+        return super.importList(list, updateSupport, context);
+    }
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterDatumController.java

 package com.mortals.xhx.module.matter.web;
 
+import cn.hutool.core.util.RandomUtil;
 import cn.hutool.extra.servlet.ServletUtil;
 import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSON;
@@ -13,22 +14,25 @@ import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.model.Result;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
-import com.mortals.xhx.module.matter.model.MatterDatumEntity;
-import com.mortals.xhx.module.matter.model.MatterDatumFileEntity;
-import com.mortals.xhx.module.matter.model.MatterDatumFileQuery;
-import com.mortals.xhx.module.matter.model.MatterEntity;
+import com.mortals.xhx.common.utils.BeanUtil;
+import com.mortals.xhx.module.dept.model.DeptEntity;
+import com.mortals.xhx.module.dept.model.DeptQuery;
+import com.mortals.xhx.module.matter.model.*;
 import com.mortals.xhx.module.matter.service.MatterDatumFileService;
 import com.mortals.xhx.module.matter.service.MatterDatumService;
+import com.mortals.xhx.module.matter.service.MatterService;
+import com.mortals.xhx.module.site.model.SiteEntity;
+import com.mortals.xhx.module.site.model.SiteQuery;
 import lombok.extern.slf4j.Slf4j;
 import org.slf4j.MDC;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import static com.mortals.framework.ap.SysConstains.MESSAGE_INFO;
@@ -50,6 +54,10 @@ public class MatterDatumController extends BaseCRUDJsonBodyMappingController<Mat
     @Autowired
     private MatterDatumFileService matterDatumFileService;
 
+    @Autowired
+    private MatterService matterService;
+
+
     public MatterDatumController() {
         super.setModuleDesc("事项申请材料");
     }
@@ -193,4 +201,44 @@ public class MatterDatumController extends BaseCRUDJsonBodyMappingController<Mat
         }
     }
 
+
+    @Override
+    @UnAuth
+    public String importData(MultipartFile file, boolean updateSupport) {
+        return super.importData(file, updateSupport);
+    }
+
+    @Override
+    public void doImportDataBefore(List<MatterDatumEntity> list, boolean updateSupport, Context context) throws AppException {
+        super.doImportDataBefore(list, updateSupport, context);
+
+        Iterator<MatterDatumEntity> iterator = list.iterator();
+        while (iterator.hasNext()) {
+            MatterDatumEntity item = iterator.next();
+            if (ObjectUtils.isEmpty(item.getAreaCode())) {
+                log.info("事项名称:{},区域编码为空", item.getMatterName());
+                iterator.remove();
+                return;
+            }
+
+            MatterEntity matterEntity = matterService.selectOne(new MatterQuery().areaCode(item.getAreaCode())
+                    .matterName(item.getMatterName()));
+            if (ObjectUtils.isEmpty(matterEntity)) {
+                log.info("事项名称:{},不存在", item.getMatterName());
+                iterator.remove();
+                return;
+            }
+            //根据事项id查询材料 并且删除
+            Long[] delIds = this.service.find(new MatterDatumQuery().matterId(matterEntity.getId()))
+                    .stream().map(MatterDatumEntity::getId).toArray(Long[]::new);
+            this.service.remove(delIds, context);
+
+            item.setMatterId(matterEntity.getId());
+            item.setMatterCode(matterEntity.getMatterNo());
+            item.setSource(matterEntity.getSource());
+        }
+
+
+
+    }
 }
\ No newline at end of file

base-manager/src/main/resources/sqlmap/module/app/AppCategoryMapper.xml

@@ -254,7 +254,7 @@
     </select>
     <!-- 根据主健删除 -->
     <delete id="deleteByKey" parameterType="paramDto">
-        delete a.* from mortals_sys_app_category as a where a.id=#{condition.id}
+        delete  from mortals_sys_app_category as a where a.id=#{condition.id}
     </delete>
     <!-- 根据主健删除一批，针对单一主健有效 -->
     <delete id="deleteByKeys">
@@ -280,7 +280,7 @@
     </delete>
     <!-- 根据paramDto删除一批 -->
     <delete id="deleteByMap" parameterType="paramDto">
-        delete a.* from mortals_sys_app_category as a
+        delete  from mortals_sys_app_category as a
         <trim suffixOverrides="where" suffix="">
             where
             <trim prefixOverrides="and" prefix="">

base-manager/src/main/resources/sqlmap/module/app/AppDatasetMapper.xml

@@ -169,7 +169,7 @@
     </select>
     <!-- 根据主健删除 -->
     <delete id="deleteByKey" parameterType="paramDto">
-        delete a.* from mortals_sys_app_dataset as a where a.id=#{condition.id}
+        delete  from mortals_sys_app_dataset as a where a.id=#{condition.id}
     </delete>
     <!-- 根据主健删除一批，针对单一主健有效 -->
     <delete id="deleteByKeys">
@@ -195,7 +195,7 @@
     </delete>
     <!-- 根据paramDto删除一批 -->
     <delete id="deleteByMap" parameterType="paramDto">
-        delete a.* from mortals_sys_app_dataset as a
+        delete  from mortals_sys_app_dataset as a
         <trim suffixOverrides="where" suffix="">
             where
             <trim prefixOverrides="and" prefix="">

base-manager/src/main/resources/sqlmap/module/app/AppInfoFieldMapper.xml

@@ -390,7 +390,7 @@
     </select>
     <!-- 根据主健删除 -->
     <delete id="deleteByKey" parameterType="paramDto">
-        delete a.* from mortals_sys_app_info_field as a where a.id=#{condition.id}
+        delete  from mortals_sys_app_info_field as a where a.id=#{condition.id}
     </delete>
     <!-- 根据主健删除一批，针对单一主健有效 -->
     <delete id="deleteByKeys">
@@ -416,7 +416,7 @@
     </delete>
     <!-- 根据paramDto删除一批 -->
     <delete id="deleteByMap" parameterType="paramDto">
-        delete a.* from mortals_sys_app_info_field as a
+        delete  from mortals_sys_app_info_field as a
         <trim suffixOverrides="where" suffix="">
             where
             <trim prefixOverrides="and" prefix="">

base-manager/src/main/resources/sqlmap/module/app/AppInfoTempleteFieldMapper.xml

@@ -390,7 +390,7 @@
     </select>
     <!-- 根据主健删除 -->
     <delete id="deleteByKey" parameterType="paramDto">
-        delete a.* from mortals_sys_app_info_templete_field as a where a.id=#{condition.id}
+        delete  from mortals_sys_app_info_templete_field as a where a.id=#{condition.id}
     </delete>
     <!-- 根据主健删除一批，针对单一主健有效 -->
     <delete id="deleteByKeys">
@@ -416,7 +416,7 @@
     </delete>
     <!-- 根据paramDto删除一批 -->
     <delete id="deleteByMap" parameterType="paramDto">
-        delete a.* from mortals_sys_app_info_templete_field as a
+        delete  from mortals_sys_app_info_templete_field as a
         <trim suffixOverrides="where" suffix="">
             where
             <trim prefixOverrides="and" prefix="">

base-manager/src/main/resources/sqlmap/module/app/AppMapper.xml

@@ -475,7 +475,7 @@
     </select>
     <!-- 根据主健删除 -->
     <delete id="deleteByKey" parameterType="paramDto">
-        delete a.* from mortals_sys_app as a where a.id=#{condition.id}
+        delete  from mortals_sys_app as a where a.id=#{condition.id}
     </delete>
     <!-- 根据主健删除一批，针对单一主健有效 -->
     <delete id="deleteByKeys">
@@ -501,7 +501,7 @@
     </delete>
     <!-- 根据paramDto删除一批 -->
     <delete id="deleteByMap" parameterType="paramDto">
-        delete a.* from mortals_sys_app as a
+        delete  from mortals_sys_app as a
         <trim suffixOverrides="where" suffix="">
             where
             <trim prefixOverrides="and" prefix="">

base-manager/src/main/resources/sqlmap/module/app/AppVersionMapper.xml

@@ -254,7 +254,7 @@
     </select>
     <!-- 根据主健删除 -->
     <delete id="deleteByKey" parameterType="paramDto">
-        delete a.* from mortals_sys_app_version as a where a.id=#{condition.id}
+        delete  from mortals_sys_app_version as a where a.id=#{condition.id}
     </delete>
     <!-- 根据主健删除一批，针对单一主健有效 -->
     <delete id="deleteByKeys">
@@ -280,7 +280,7 @@
     </delete>
     <!-- 根据paramDto删除一批 -->
     <delete id="deleteByMap" parameterType="paramDto">
-        delete a.* from mortals_sys_app_version as a
+        delete  from mortals_sys_app_version as a
         <trim suffixOverrides="where" suffix="">
             where
             <trim prefixOverrides="and" prefix="">

base-manager/src/main/resources/sqlmap/module/area/AreaMapper.xml

@@ -316,7 +316,7 @@
     </select>
     <!-- 根据主健删除 -->
     <delete id="deleteByKey" parameterType="paramDto">
-        delete a.* from mortals_sys_area as a where a.id=#{condition.id}
+        delete  from mortals_sys_area as a where a.id=#{condition.id}
     </delete>
     <!-- 根据主健删除一批，针对单一主健有效 -->
     <delete id="deleteByKeys">
@@ -327,7 +327,7 @@
     </delete>
     <!-- 根据paramDto删除一批 -->
     <delete id="deleteByMap" parameterType="paramDto">
-        delete a.* from mortals_sys_area as a
+        delete  from mortals_sys_area as a
         <trim suffixOverrides="where" suffix="">
             where
             <trim prefixOverrides="and" prefix="">

base-manager/src/main/resources/sqlmap/module/base/BaseAreaMapper.xml

@@ -316,7 +316,7 @@
     </select>
     <!-- 根据主健删除 -->
     <delete id="deleteByKey" parameterType="paramDto">
-        delete a.* from mortals_sys_base_area as a where a.id=#{condition.id}
+        delete  from mortals_sys_base_area as a where a.id=#{condition.id}
     </delete>
     <!-- 根据主健删除一批，针对单一主健有效 -->
     <delete id="deleteByKeys">
@@ -342,7 +342,7 @@
     </delete>
     <!-- 根据paramDto删除一批 -->
     <delete id="deleteByMap" parameterType="paramDto">
-        delete a.* from mortals_sys_base_area as a
+        delete  from mortals_sys_base_area as a
         <trim suffixOverrides="where" suffix="">
             where
             <trim prefixOverrides="and" prefix="">

base-manager/src/main/resources/sqlmap/module/business/BusinessMapper.xml

@@ -342,7 +342,7 @@
     </select>
     <!-- 根据主健删除 -->
     <delete id="deleteByKey" parameterType="paramDto">
-        delete a.* from mortals_sys_business as a where a.id=#{condition.id}
+        delete  from mortals_sys_business as a where a.id=#{condition.id}
     </delete>
     <!-- 根据主健删除一批，针对单一主健有效 -->
     <delete id="deleteByKeys">
@@ -353,7 +353,7 @@
     </delete>
     <!-- 根据paramDto删除一批 -->
     <delete id="deleteByMap" parameterType="paramDto">
-        delete a.* from mortals_sys_business as a
+        delete  from mortals_sys_business as a
         <trim suffixOverrides="where" suffix="">
             where
             <trim prefixOverrides="and" prefix="">

base-manager/src/main/resources/sqlmap/module/business/BusinessMatterMapper.xml

@@ -226,7 +226,7 @@
     </select>
     <!-- 根据主健删除 -->
     <delete id="deleteByKey" parameterType="paramDto">
-        delete a.* from mortals_sys_business_matter as a where a.id=#{condition.id}
+        delete  from mortals_sys_business_matter as a where a.id=#{condition.id}
     </delete>
     <!-- 根据主健删除一批，针对单一主健有效 -->
     <delete id="deleteByKeys">
@@ -237,7 +237,7 @@
     </delete>
     <!-- 根据paramDto删除一批 -->
     <delete id="deleteByMap" parameterType="paramDto">
-        delete a.* from mortals_sys_business_matter as a
+        delete  from mortals_sys_business_matter as a
         <trim suffixOverrides="where" suffix="">
             where
             <trim prefixOverrides="and" prefix="">

base-manager/src/main/resources/sqlmap/module/dept/DeptMapper.xml

@@ -480,7 +480,7 @@
     </select>
     <!-- 根据主健删除 -->
     <delete id="deleteByKey" parameterType="paramDto">
-        delete a.* from mortals_sys_dept as a where a.id=#{condition.id}
+        delete  from mortals_sys_dept as a where a.id=#{condition.id}
     </delete>
     <!-- 根据主健删除一批，针对单一主健有效 -->
     <delete id="deleteByKeys">
@@ -506,7 +506,7 @@
     </delete>
     <!-- 根据paramDto删除一批 -->
     <delete id="deleteByMap" parameterType="paramDto">
-        delete a.* from mortals_sys_dept as a
+        delete  from mortals_sys_dept as a
         <trim suffixOverrides="where" suffix="">
             where
             <trim prefixOverrides="and" prefix="">

base-manager/src/main/resources/sqlmap/module/device/DeviceMapper.xml

@@ -418,7 +418,7 @@
     </select>
     <!-- 根据主健删除 -->
     <delete id="deleteByKey" parameterType="paramDto">
-        delete a.* from mortals_xhx_device as a where a.id=#{condition.id}
+        delete from mortals_xhx_device as a where a.id=#{condition.id}
     </delete>
     <!-- 根据主健删除一批，针对单一主健有效 -->
     <delete id="deleteByKeys">
@@ -444,7 +444,7 @@
     </delete>
     <!-- 根据paramDto删除一批 -->
     <delete id="deleteByMap" parameterType="paramDto">
-        delete a.* from mortals_xhx_device as a
+        delete from mortals_xhx_device as a
         <trim suffixOverrides="where" suffix="">
             where
             <trim prefixOverrides="and" prefix="">

base-manager/src/main/resources/sqlmap/module/dimension/DimensionMapper.xml

@@ -204,7 +204,7 @@
     </select>
     <!-- 根据主健删除 -->
     <delete id="deleteByKey" parameterType="paramDto">
-        delete a.* from mortals_xhx_dimension as a where a.id=#{condition.id}
+        delete from mortals_xhx_dimension as a where a.id=#{condition.id}
     </delete>
     <!-- 根据主健删除一批，针对单一主健有效 -->
     <delete id="deleteByKeys">
@@ -230,7 +230,7 @@
     </delete>
     <!-- 根据paramDto删除一批 -->
     <delete id="deleteByMap" parameterType="paramDto">
-        delete a.* from mortals_xhx_dimension as a
+        delete from mortals_xhx_dimension as a
         <trim suffixOverrides="where" suffix="">
             where
             <trim prefixOverrides="and" prefix="">

base-manager/src/main/resources/sqlmap/module/dimension/DimensionResourceRuleMapper.xml

@@ -290,7 +290,7 @@
     </select>
     <!-- 根据主健删除 -->
     <delete id="deleteByKey" parameterType="paramDto">
-        delete a.* from mortals_xhx_dimension_resource_rule as a where a.id=#{condition.id}
+        delete from mortals_xhx_dimension_resource_rule as a where a.id=#{condition.id}
     </delete>
     <!-- 根据主健删除一批，针对单一主健有效 -->
     <delete id="deleteByKeys">
@@ -316,7 +316,7 @@
     </delete>
     <!-- 根据paramDto删除一批 -->
     <delete id="deleteByMap" parameterType="paramDto">
-        delete a.* from mortals_xhx_dimension_resource_rule as a
+        delete from mortals_xhx_dimension_resource_rule as a
         <trim suffixOverrides="where" suffix="">
             where
             <trim prefixOverrides="and" prefix="">

base-manager/src/main/resources/sqlmap/module/holiday/HolidayMapper.xml

@@ -254,7 +254,7 @@
     </select>
     <!-- 根据主健删除 -->
     <delete id="deleteByKey" parameterType="paramDto">
-        delete a.* from mortals_sys_holiday as a where a.id=#{condition.id}
+        delete from mortals_sys_holiday as a where a.id=#{condition.id}
     </delete>
     <!-- 根据主健删除一批，针对单一主健有效 -->
     <delete id="deleteByKeys">
@@ -265,7 +265,7 @@
     </delete>
     <!-- 根据paramDto删除一批 -->
     <delete id="deleteByMap" parameterType="paramDto">
-        delete a.* from mortals_sys_holiday as a
+        delete from mortals_sys_holiday as a
         <trim suffixOverrides="where" suffix="">
             where
             <trim prefixOverrides="and" prefix="">

base-manager/src/main/resources/sqlmap/module/matter/MatterAcceptMapper.xml

@@ -204,7 +204,7 @@
     </select>
     <!-- 根据主健删除 -->
     <delete id="deleteByKey" parameterType="paramDto">
-        delete a.* from mortals_sys_matter_accept as a where a.id=#{condition.id}
+        delete from mortals_sys_matter_accept as a where a.id=#{condition.id}
     </delete>
     <!-- 根据主健删除一批，针对单一主健有效 -->
     <delete id="deleteByKeys">
@@ -215,7 +215,7 @@
     </delete>
     <!-- 根据paramDto删除一批 -->
     <delete id="deleteByMap" parameterType="paramDto">
-        delete a.* from mortals_sys_matter_accept as a
+        delete from mortals_sys_matter_accept as a
         <trim suffixOverrides="where" suffix="">
             where
             <trim prefixOverrides="and" prefix="">

base-manager/src/main/resources/sqlmap/module/matter/MatterChannelMapper.xml

@@ -294,7 +294,7 @@
     </select>
     <!-- 根据主健删除 -->
     <delete id="deleteByKey" parameterType="paramDto">
-        delete a.* from mortals_sys_matter_channel as a where a.id=#{condition.id}
+        delete from mortals_sys_matter_channel as a where a.id=#{condition.id}
     </delete>
     <!-- 根据主健删除一批，针对单一主健有效 -->
     <delete id="deleteByKeys">
@@ -320,7 +320,7 @@
     </delete>
     <!-- 根据paramDto删除一批 -->
     <delete id="deleteByMap" parameterType="paramDto">
-        delete a.* from mortals_sys_matter_channel as a
+        delete from mortals_sys_matter_channel as a
         <trim suffixOverrides="where" suffix="">
             where
             <trim prefixOverrides="and" prefix="">

base-manager/src/main/resources/sqlmap/module/matter/MatterChargesMapper.xml

@@ -204,7 +204,7 @@
     </select>
     <!-- 根据主健删除 -->
     <delete id="deleteByKey" parameterType="paramDto">
-        delete a.* from mortals_sys_matter_charges as a where a.id=#{condition.id}
+        delete from mortals_sys_matter_charges as a where a.id=#{condition.id}
     </delete>
     <!-- 根据主健删除一批，针对单一主健有效 -->
     <delete id="deleteByKeys">
@@ -215,7 +215,7 @@
     </delete>
     <!-- 根据paramDto删除一批 -->
     <delete id="deleteByMap" parameterType="paramDto">
-        delete a.* from mortals_sys_matter_charges as a
+        delete from mortals_sys_matter_charges as a
         <trim suffixOverrides="where" suffix="">
             where
             <trim prefixOverrides="and" prefix="">

base-manager/src/main/resources/sqlmap/module/matter/MatterDatumFileMapper.xml

@@ -246,7 +246,7 @@
     </select>
     <!-- 根据主健删除 -->
     <delete id="deleteByKey" parameterType="paramDto">
-        delete a.* from mortals_sys_matter_datum_file as a where a.id=#{condition.id}
+        delete from mortals_sys_matter_datum_file as a where a.id=#{condition.id}
     </delete>
     <!-- 根据主健删除一批，针对单一主健有效 -->
     <delete id="deleteByKeys">
@@ -257,7 +257,7 @@
     </delete>
     <!-- 根据paramDto删除一批 -->
     <delete id="deleteByMap" parameterType="paramDto">
-        delete a.* from mortals_sys_matter_datum_file as a
+        delete from mortals_sys_matter_datum_file as a
         <trim suffixOverrides="where" suffix="">
             where
             <trim prefixOverrides="and" prefix="">

base-manager/src/main/resources/sqlmap/module/matter/MatterDatumMapper.xml

@@ -469,7 +469,7 @@
     </select>
     <!-- 根据主健删除 -->
     <delete id="deleteByKey" parameterType="paramDto">
-        delete a.* from mortals_sys_matter_datum as a where a.id=#{condition.id}
+        delete from mortals_sys_matter_datum as a where a.id=#{condition.id}
     </delete>
     <!-- 根据主健删除一批，针对单一主健有效 -->
     <delete id="deleteByKeys">
@@ -480,7 +480,7 @@
     </delete>
     <!-- 根据paramDto删除一批 -->
     <delete id="deleteByMap" parameterType="paramDto">
-        delete a.* from mortals_sys_matter_datum as a
+        delete from mortals_sys_matter_datum as a
         <trim suffixOverrides="where" suffix="">
             where
             <trim prefixOverrides="and" prefix="">

base-manager/src/main/resources/sqlmap/module/matter/MatterExtMapper.xml

@@ -268,7 +268,7 @@
     </select>
     <!-- 根据主健删除 -->
     <delete id="deleteByKey" parameterType="paramDto">
-        delete a.* from mortals_sys_matter_ext as a where a.id=#{condition.id}
+        delete from mortals_sys_matter_ext as a where a.id=#{condition.id}
     </delete>
     <!-- 根据主健删除一批，针对单一主健有效 -->
     <delete id="deleteByKeys">
@@ -294,7 +294,7 @@
     </delete>
     <!-- 根据paramDto删除一批 -->
     <delete id="deleteByMap" parameterType="paramDto">
-        delete a.* from mortals_sys_matter_ext as a
+        delete from mortals_sys_matter_ext as a
         <trim suffixOverrides="where" suffix="">
             where
             <trim prefixOverrides="and" prefix="">

base-manager/src/main/resources/sqlmap/module/matter/MatterFlowlimitMapper.xml

@@ -246,7 +246,7 @@
     </select>
     <!-- 根据主健删除 -->
     <delete id="deleteByKey" parameterType="paramDto">
-        delete a.* from mortals_sys_matter_flowlimit as a where a.id=#{condition.id}
+        delete from mortals_sys_matter_flowlimit as a where a.id=#{condition.id}
     </delete>
     <!-- 根据主健删除一批，针对单一主健有效 -->
     <delete id="deleteByKeys">
@@ -257,7 +257,7 @@
     </delete>
     <!-- 根据paramDto删除一批 -->
     <delete id="deleteByMap" parameterType="paramDto">
-        delete a.* from mortals_sys_matter_flowlimit as a
+        delete from mortals_sys_matter_flowlimit as a
         <trim suffixOverrides="where" suffix="">
             where
             <trim prefixOverrides="and" prefix="">

base-manager/src/main/resources/sqlmap/module/matter/MatterIntermediaryMapper.xml

@@ -246,7 +246,7 @@
     </select>
     <!-- 根据主健删除 -->
     <delete id="deleteByKey" parameterType="paramDto">
-        delete a.* from mortals_sys_matter_intermediary as a where a.id=#{condition.id}
+        delete from mortals_sys_matter_intermediary as a where a.id=#{condition.id}
     </delete>
     <!-- 根据主健删除一批，针对单一主健有效 -->
     <delete id="deleteByKeys">
@@ -257,7 +257,7 @@
     </delete>
     <!-- 根据paramDto删除一批 -->
     <delete id="deleteByMap" parameterType="paramDto">
-        delete a.* from mortals_sys_matter_intermediary as a
+        delete from mortals_sys_matter_intermediary as a
         <trim suffixOverrides="where" suffix="">
             where
             <trim prefixOverrides="and" prefix="">

base-manager/src/main/resources/sqlmap/module/matter/MatterMapper.xml

@@ -1270,7 +1270,7 @@
     </select>
     <!-- 根据主健删除 -->
     <delete id="deleteByKey" parameterType="paramDto">
-        delete a.* from mortals_sys_matter as a where a.id=#{condition.id}
+        delete from mortals_sys_matter as a where a.id=#{condition.id}
     </delete>
     <!-- 根据主健删除一批，针对单一主健有效 -->
     <delete id="deleteByKeys">
@@ -1296,7 +1296,7 @@
     </delete>
     <!-- 根据paramDto删除一批 -->
     <delete id="deleteByMap" parameterType="paramDto">
-        delete a.* from mortals_sys_matter as a
+        delete from mortals_sys_matter as a
         <trim suffixOverrides="where" suffix="">
             where
             <trim prefixOverrides="and" prefix="">

base-manager/src/main/resources/sqlmap/module/matter/MatterQuestionMapper.xml

@@ -218,7 +218,7 @@
     </select>
     <!-- 根据主健删除 -->
     <delete id="deleteByKey" parameterType="paramDto">
-        delete a.* from mortals_sys_matter_question as a where a.id=#{condition.id}
+        delete from mortals_sys_matter_question as a where a.id=#{condition.id}
     </delete>
     <!-- 根据主健删除一批，针对单一主健有效 -->
     <delete id="deleteByKeys">
@@ -229,7 +229,7 @@
     </delete>
     <!-- 根据paramDto删除一批 -->
     <delete id="deleteByMap" parameterType="paramDto">
-        delete a.* from mortals_sys_matter_question as a
+        delete from mortals_sys_matter_question as a
         <trim suffixOverrides="where" suffix="">
             where
             <trim prefixOverrides="and" prefix="">

base-manager/src/main/resources/sqlmap/module/matter/MatterSetbaseMapper.xml

@@ -246,7 +246,7 @@
     </select>
     <!-- 根据主健删除 -->
     <delete id="deleteByKey" parameterType="paramDto">
-        delete a.* from mortals_sys_matter_setbase as a where a.id=#{condition.id}
+        delete from mortals_sys_matter_setbase as a where a.id=#{condition.id}
     </delete>
     <!-- 根据主健删除一批，针对单一主健有效 -->
     <delete id="deleteByKeys">
@@ -257,7 +257,7 @@
     </delete>
     <!-- 根据paramDto删除一批 -->
     <delete id="deleteByMap" parameterType="paramDto">
-        delete a.* from mortals_sys_matter_setbase as a
+        delete from mortals_sys_matter_setbase as a
         <trim suffixOverrides="where" suffix="">
             where
             <trim prefixOverrides="and" prefix="">

base-manager/src/main/resources/sqlmap/module/model/ModelCensusMapper.xml

@@ -262,7 +262,7 @@
     </select>
     <!-- 根据主健删除 -->
     <delete id="deleteByKey" parameterType="paramDto">
-        delete a.* from mortals_sys_model_census as a where a.id=#{condition.id}
+        delete from mortals_sys_model_census as a where a.id=#{condition.id}
     </delete>
     <!-- 根据主健删除一批，针对单一主健有效 -->
     <delete id="deleteByKeys">
@@ -273,7 +273,7 @@
     </delete>
     <!-- 根据paramDto删除一批 -->
     <delete id="deleteByMap" parameterType="paramDto">
-        delete a.* from mortals_sys_model_census as a
+        delete from mortals_sys_model_census as a
         <trim suffixOverrides="where" suffix="">
             where
             <trim prefixOverrides="and" prefix="">

base-manager/src/main/resources/sqlmap/module/model/ModelMapper.xml

@@ -232,7 +232,7 @@
     </select>
     <!-- 根据主健删除 -->
     <delete id="deleteByKey" parameterType="paramDto">
-        delete a.* from mortals_sys_model as a where a.id=#{condition.id}
+        delete from mortals_sys_model as a where a.id=#{condition.id}
     </delete>
     <!-- 根据主健删除一批，针对单一主健有效 -->
     <delete id="deleteByKeys">
@@ -258,7 +258,7 @@
     </delete>
     <!-- 根据paramDto删除一批 -->
     <delete id="deleteByMap" parameterType="paramDto">
-        delete a.* from mortals_sys_model as a
+        delete from mortals_sys_model as a
         <trim suffixOverrides="where" suffix="">
             where
             <trim prefixOverrides="and" prefix="">

base-manager/src/main/resources/sqlmap/module/ph/PhQueueMapper.xml

@@ -562,7 +562,7 @@
     </select>
     <!-- 根据主健删除 -->
     <delete id="deleteByKey" parameterType="paramDto">
-        delete a.* from mortals_xhx_ph_queue as a where a.id=#{condition.id}
+        delete from mortals_xhx_ph_queue as a where a.id=#{condition.id}
     </delete>
     <!-- 根据主健删除一批，针对单一主健有效 -->
     <delete id="deleteByKeys">
@@ -588,7 +588,7 @@
     </delete>
     <!-- 根据paramDto删除一批 -->
     <delete id="deleteByMap" parameterType="paramDto">
-        delete a.* from mortals_xhx_ph_queue as a
+        delete from mortals_xhx_ph_queue as a
         <trim suffixOverrides="where" suffix="">
             where
             <trim prefixOverrides="and" prefix="">

base-manager/src/main/resources/sqlmap/module/pj/PjEvaluateMapper.xml

@@ -560,7 +560,7 @@
     </select>
     <!-- 根据主健删除 -->
     <delete id="deleteByKey" parameterType="paramDto">
-        delete a.* from mortals_xhx_pj_evaluate as a where a.id=#{condition.id}
+        delete from mortals_xhx_pj_evaluate as a where a.id=#{condition.id}
     </delete>
     <!-- 根据主健删除一批，针对单一主健有效 -->
     <delete id="deleteByKeys">
@@ -586,7 +586,7 @@
     </delete>
     <!-- 根据paramDto删除一批 -->
     <delete id="deleteByMap" parameterType="paramDto">
-        delete a.* from mortals_xhx_pj_evaluate as a
+        delete from mortals_xhx_pj_evaluate as a
         <trim suffixOverrides="where" suffix="">
             where
             <trim prefixOverrides="and" prefix="">

base-manager/src/main/resources/sqlmap/module/product/ProductMapper.xml

@@ -182,7 +182,7 @@
     </select>
     <!-- 根据主健删除 -->
     <delete id="deleteByKey" parameterType="paramDto">
-        delete a.* from mortals_xhx_product as a where a.id=#{condition.id}
+        delete from mortals_xhx_product as a where a.id=#{condition.id}
     </delete>
     <!-- 根据主健删除一批，针对单一主健有效 -->
     <delete id="deleteByKeys">
@@ -193,7 +193,7 @@
     </delete>
     <!-- 根据paramDto删除一批 -->
     <delete id="deleteByMap" parameterType="paramDto">
-        delete a.* from mortals_xhx_product as a
+        delete from mortals_xhx_product as a
         <trim suffixOverrides="where" suffix="">
             where
             <trim prefixOverrides="and" prefix="">

base-manager/src/main/resources/sqlmap/module/site/SiteBusinessMapper.xml

@@ -270,7 +270,7 @@
     </select>
     <!-- 根据主健删除 -->
     <delete id="deleteByKey" parameterType="paramDto">
-        delete a.* from mortals_sys_site_business as a where a.id=#{condition.id}
+        delete from mortals_sys_site_business as a where a.id=#{condition.id}
     </delete>
     <!-- 根据主健删除一批，针对单一主健有效 -->
     <delete id="deleteByKeys">
@@ -296,7 +296,7 @@
     </delete>
     <!-- 根据paramDto删除一批 -->
     <delete id="deleteByMap" parameterType="paramDto">
-        delete a.* from mortals_sys_site_business as a
+        delete from mortals_sys_site_business as a
         <trim suffixOverrides="where" suffix="">
             where
             <trim prefixOverrides="and" prefix="">

base-manager/src/main/resources/sqlmap/module/site/SiteHallMapper.xml

@@ -262,7 +262,7 @@
     </select>
     <!-- 根据主健删除 -->
     <delete id="deleteByKey" parameterType="paramDto">
-        delete a.* from mortals_sys_site_hall as a where a.id=#{condition.id}
+        delete from mortals_sys_site_hall as a where a.id=#{condition.id}
     </delete>
     <!-- 根据主健删除一批，针对单一主健有效 -->
     <delete id="deleteByKeys">
@@ -288,7 +288,7 @@
     </delete>
     <!-- 根据paramDto删除一批 -->
     <delete id="deleteByMap" parameterType="paramDto">
-        delete a.* from mortals_sys_site_hall as a
+        delete from mortals_sys_site_hall as a
         <trim suffixOverrides="where" suffix="">
             where
             <trim prefixOverrides="and" prefix="">

base-manager/src/main/resources/sqlmap/module/site/SiteMapper.xml

@@ -744,7 +744,7 @@
     </select>
     <!-- 根据主健删除 -->
     <delete id="deleteByKey" parameterType="paramDto">
-        delete a.* from mortals_sys_site as a where a.id=#{condition.id}
+        delete from mortals_sys_site as a where a.id=#{condition.id}
     </delete>
     <!-- 根据主健删除一批，针对单一主健有效 -->
     <delete id="deleteByKeys">
@@ -770,7 +770,7 @@
     </delete>
     <!-- 根据paramDto删除一批 -->
     <delete id="deleteByMap" parameterType="paramDto">
-        delete a.* from mortals_sys_site as a
+        delete from mortals_sys_site as a
         <trim suffixOverrides="where" suffix="">
             where
             <trim prefixOverrides="and" prefix="">

base-manager/src/main/resources/sqlmap/module/site/SiteMatterMapper.xml

@@ -420,7 +420,7 @@
     </select>
     <!-- 根据主健删除 -->
     <delete id="deleteByKey" parameterType="paramDto">
-        delete a.* from mortals_sys_site_matter as a where a.id=#{condition.id}
+        delete from mortals_sys_site_matter as a where a.id=#{condition.id}
     </delete>
     <!-- 根据主健删除一批，针对单一主健有效 -->
     <delete id="deleteByKeys">
@@ -446,7 +446,7 @@
     </delete>
     <!-- 根据paramDto删除一批 -->
     <delete id="deleteByMap" parameterType="paramDto">
-        delete a.* from mortals_sys_site_matter as a
+        delete from mortals_sys_site_matter as a
         <trim suffixOverrides="where" suffix="">
             where
             <trim prefixOverrides="and" prefix="">

base-manager/src/main/resources/sqlmap/module/site/SiteModelMapper.xml

@@ -190,7 +190,7 @@
     </select>
     <!-- 根据主健删除 -->
     <delete id="deleteByKey" parameterType="paramDto">
-        delete a.* from mortals_sys_site_model as a where a.id=#{condition.id}
+        delete from mortals_sys_site_model as a where a.id=#{condition.id}
     </delete>
     <!-- 根据主健删除一批，针对单一主健有效 -->
     <delete id="deleteByKeys">
@@ -201,7 +201,7 @@
     </delete>
     <!-- 根据paramDto删除一批 -->
     <delete id="deleteByMap" parameterType="paramDto">
-        delete a.* from mortals_sys_site_model as a
+        delete from mortals_sys_site_model as a
         <trim suffixOverrides="where" suffix="">
             where
             <trim prefixOverrides="and" prefix="">

base-manager/src/main/resources/sqlmap/module/site/SiteThemeMapper.xml

@@ -182,7 +182,7 @@
     </select>
     <!-- 根据主健删除 -->
     <delete id="deleteByKey" parameterType="paramDto">
-        delete a.* from mortals_sys_site_theme as a where a.id=#{condition.id}
+        delete from mortals_sys_site_theme as a where a.id=#{condition.id}
     </delete>
     <!-- 根据主健删除一批，针对单一主健有效 -->
     <delete id="deleteByKeys">
@@ -208,7 +208,7 @@
     </delete>
     <!-- 根据paramDto删除一批 -->
     <delete id="deleteByMap" parameterType="paramDto">
-        delete a.* from mortals_sys_site_theme as a
+        delete from mortals_sys_site_theme as a
         <trim suffixOverrides="where" suffix="">
             where
             <trim prefixOverrides="and" prefix="">

base-manager/src/main/resources/sqlmap/module/site/SiteThemeMatterMapper.xml

@@ -312,7 +312,7 @@
     </select>
     <!-- 根据主健删除 -->
     <delete id="deleteByKey" parameterType="paramDto">
-        delete a.* from mortals_sys_site_theme_matter as a where a.id=#{condition.id}
+        delete from mortals_sys_site_theme_matter as a where a.id=#{condition.id}
     </delete>
     <!-- 根据主健删除一批，针对单一主健有效 -->
     <delete id="deleteByKeys">
@@ -338,7 +338,7 @@
     </delete>
     <!-- 根据paramDto删除一批 -->
     <delete id="deleteByMap" parameterType="paramDto">
-        delete a.* from mortals_sys_site_theme_matter as a
+        delete from mortals_sys_site_theme_matter as a
         <trim suffixOverrides="where" suffix="">
             where
             <trim prefixOverrides="and" prefix="">

base-manager/src/main/resources/sqlmap/module/skin/SkinBaseMapper.xml

@@ -254,7 +254,7 @@
     </select>
     <!-- 根据主健删除 -->
     <delete id="deleteByKey" parameterType="paramDto">
-        delete a.* from mortals_sys_skin_base as a where a.id=#{condition.id}
+        delete from mortals_sys_skin_base as a where a.id=#{condition.id}
     </delete>
     <!-- 根据主健删除一批，针对单一主健有效 -->
     <delete id="deleteByKeys">
@@ -265,7 +265,7 @@
     </delete>
     <!-- 根据paramDto删除一批 -->
     <delete id="deleteByMap" parameterType="paramDto">
-        delete a.* from mortals_sys_skin_base as a
+        delete from mortals_sys_skin_base as a
         <trim suffixOverrides="where" suffix="">
             where
             <trim prefixOverrides="and" prefix="">

base-manager/src/main/resources/sqlmap/module/skin/SkinCategoryMapper.xml

@@ -132,7 +132,7 @@
     </select>
     <!-- 根据主健删除 -->
     <delete id="deleteByKey" parameterType="paramDto">
-        delete a.* from mortals_sys_skin_category as a where a.id=#{condition.id}
+        delete from mortals_sys_skin_category as a where a.id=#{condition.id}
     </delete>
     <!-- 根据主健删除一批，针对单一主健有效 -->
     <delete id="deleteByKeys">
@@ -143,7 +143,7 @@
     </delete>
     <!-- 根据paramDto删除一批 -->
     <delete id="deleteByMap" parameterType="paramDto">
-        delete a.* from mortals_sys_skin_category as a
+        delete from mortals_sys_skin_category as a
         <trim suffixOverrides="where" suffix="">
             where
             <trim prefixOverrides="and" prefix="">

base-manager/src/main/resources/sqlmap/module/skin/SkinFieldMapper.xml

@@ -334,7 +334,7 @@
     </select>
     <!-- 根据主健删除 -->
     <delete id="deleteByKey" parameterType="paramDto">
-        delete a.* from mortals_sys_skin_field as a where a.id=#{condition.id}
+        delete from mortals_sys_skin_field as a where a.id=#{condition.id}
     </delete>
     <!-- 根据主健删除一批，针对单一主健有效 -->
     <delete id="deleteByKeys">
@@ -345,7 +345,7 @@
     </delete>
     <!-- 根据paramDto删除一批 -->
     <delete id="deleteByMap" parameterType="paramDto">
-        delete a.* from mortals_sys_skin_field as a
+        delete from mortals_sys_skin_field as a
         <trim suffixOverrides="where" suffix="">
             where
             <trim prefixOverrides="and" prefix="">

base-manager/src/main/resources/sqlmap/module/skin/SkinTemplateMapper.xml

@@ -168,7 +168,7 @@
     </select>
     <!-- 根据主健删除 -->
     <delete id="deleteByKey" parameterType="paramDto">
-        delete a.* from mortals_sys_skin_template as a where a.id=#{condition.id}
+        delete from mortals_sys_skin_template as a where a.id=#{condition.id}
     </delete>
     <!-- 根据主健删除一批，针对单一主健有效 -->
     <delete id="deleteByKeys">
@@ -179,7 +179,7 @@
     </delete>
     <!-- 根据paramDto删除一批 -->
     <delete id="deleteByMap" parameterType="paramDto">
-        delete a.* from mortals_sys_skin_template as a
+        delete from mortals_sys_skin_template as a
         <trim suffixOverrides="where" suffix="">
             where
             <trim prefixOverrides="and" prefix="">

base-manager/src/main/resources/sqlmap/module/sms/SmsSetMapper.xml

@@ -248,7 +248,7 @@
     </select>
     <!-- 根据主健删除 -->
     <delete id="deleteByKey" parameterType="paramDto">
-        delete a.* from mortals_sys_sms_set as a where a.id=#{condition.id}
+        delete from mortals_sys_sms_set as a where a.id=#{condition.id}
     </delete>
     <!-- 根据主健删除一批，针对单一主健有效 -->
     <delete id="deleteByKeys">
@@ -259,7 +259,7 @@
     </delete>
     <!-- 根据paramDto删除一批 -->
     <delete id="deleteByMap" parameterType="paramDto">
-        delete a.* from mortals_sys_sms_set as a
+        delete from mortals_sys_sms_set as a
         <trim suffixOverrides="where" suffix="">
             where
             <trim prefixOverrides="and" prefix="">

base-manager/src/main/resources/sqlmap/module/sms/SmsTemplateMapper.xml

@@ -240,7 +240,7 @@
     </select>
     <!-- 根据主健删除 -->
     <delete id="deleteByKey" parameterType="paramDto">
-        delete a.* from mortals_sys_sms_template as a where a.id=#{condition.id}
+        delete from mortals_sys_sms_template as a where a.id=#{condition.id}
     </delete>
     <!-- 根据主健删除一批，针对单一主健有效 -->
     <delete id="deleteByKeys">
@@ -251,7 +251,7 @@
     </delete>
     <!-- 根据paramDto删除一批 -->
     <delete id="deleteByMap" parameterType="paramDto">
-        delete a.* from mortals_sys_sms_template as a
+        delete from mortals_sys_sms_template as a
         <trim suffixOverrides="where" suffix="">
             where
             <trim prefixOverrides="and" prefix="">

base-manager/src/main/resources/sqlmap/module/social/SocialSecuritySetMapper.xml

@@ -356,7 +356,7 @@
     </select>
     <!-- 根据主健删除 -->
     <delete id="deleteByKey" parameterType="paramDto">
-        delete a.* from mortals_sys_social_security_set as a where a.id=#{condition.id}
+        delete from mortals_sys_social_security_set as a where a.id=#{condition.id}
     </delete>
     <!-- 根据主健删除一批，针对单一主健有效 -->
     <delete id="deleteByKeys">
@@ -382,7 +382,7 @@
     </delete>
     <!-- 根据paramDto删除一批 -->
     <delete id="deleteByMap" parameterType="paramDto">
-        delete a.* from mortals_sys_social_security_set as a
+        delete from mortals_sys_social_security_set as a
         <trim suffixOverrides="where" suffix="">
             where
             <trim prefixOverrides="and" prefix="">

base-manager/src/main/resources/sqlmap/module/window/WindowBusinessMapper.xml

@@ -190,7 +190,7 @@
     </select>
     <!-- 根据主健删除 -->
     <delete id="deleteByKey" parameterType="paramDto">
-        delete a.* from mortals_sys_window_business as a where a.id=#{condition.id}
+        delete from mortals_sys_window_business as a where a.id=#{condition.id}
     </delete>
     <!-- 根据主健删除一批，针对单一主健有效 -->
     <delete id="deleteByKeys">
@@ -201,7 +201,7 @@
     </delete>
     <!-- 根据paramDto删除一批 -->
     <delete id="deleteByMap" parameterType="paramDto">
-        delete a.* from mortals_sys_window_business as a
+        delete from mortals_sys_window_business as a
         <trim suffixOverrides="where" suffix="">
             where
             <trim prefixOverrides="and" prefix="">

base-manager/src/main/resources/sqlmap/module/window/WindowHallMapper.xml

@@ -248,7 +248,7 @@
     </select>
     <!-- 根据主健删除 -->
     <delete id="deleteByKey" parameterType="paramDto">
-        delete a.* from mortals_sys_window_hall as a where a.id=#{condition.id}
+        delete from mortals_sys_window_hall as a where a.id=#{condition.id}
     </delete>
     <!-- 根据主健删除一批，针对单一主健有效 -->
     <delete id="deleteByKeys">
@@ -274,7 +274,7 @@
     </delete>
     <!-- 根据paramDto删除一批 -->
     <delete id="deleteByMap" parameterType="paramDto">
-        delete a.* from mortals_sys_window_hall as a
+        delete from mortals_sys_window_hall as a
         <trim suffixOverrides="where" suffix="">
             where
             <trim prefixOverrides="and" prefix="">

base-manager/src/main/resources/sqlmap/module/window/WindowMapper.xml

@@ -444,7 +444,7 @@
     </select>
     <!-- 根据主健删除 -->
     <delete id="deleteByKey" parameterType="paramDto">
-        delete a.* from mortals_sys_window as a where a.id=#{condition.id}
+        delete from mortals_sys_window as a where a.id=#{condition.id}
     </delete>
     <!-- 根据主健删除一批，针对单一主健有效 -->
     <delete id="deleteByKeys">
@@ -470,7 +470,7 @@
     </delete>
     <!-- 根据paramDto删除一批 -->
     <delete id="deleteByMap" parameterType="paramDto">
-        delete a.* from mortals_sys_window as a
+        delete from mortals_sys_window as a
         <trim suffixOverrides="where" suffix="">
             where
             <trim prefixOverrides="and" prefix="">

base-manager/src/main/resources/sqlmap/module/window/WindowMatterMapper.xml

@@ -284,7 +284,7 @@
     </select>
     <!-- 根据主健删除 -->
     <delete id="deleteByKey" parameterType="paramDto">
-        delete a.* from mortals_sys_window_matter as a where a.id=#{condition.id}
+        delete from mortals_sys_window_matter as a where a.id=#{condition.id}
     </delete>
     <!-- 根据主健删除一批，针对单一主健有效 -->
     <delete id="deleteByKeys">
@@ -310,7 +310,7 @@
     </delete>
     <!-- 根据paramDto删除一批 -->
     <delete id="deleteByMap" parameterType="paramDto">
-        delete a.* from mortals_sys_window_matter as a
+        delete from mortals_sys_window_matter as a
         <trim suffixOverrides="where" suffix="">
             where
             <trim prefixOverrides="and" prefix="">

base-manager/src/main/resources/sqlmap/module/workman/WorkmanMapper.xml

@@ -600,7 +600,7 @@
     </select>
     <!-- 根据主健删除 -->
     <delete id="deleteByKey" parameterType="paramDto">
-        delete a.* from mortals_sys_workman as a where a.id=#{condition.id}
+        delete from mortals_sys_workman as a where a.id=#{condition.id}
     </delete>
     <!-- 根据主健删除一批，针对单一主健有效 -->
     <delete id="deleteByKeys">
@@ -626,7 +626,7 @@
     </delete>
     <!-- 根据paramDto删除一批 -->
     <delete id="deleteByMap" parameterType="paramDto">
-        delete a.* from mortals_sys_workman as a
+        delete from mortals_sys_workman as a
         <trim suffixOverrides="where" suffix="">
             where
             <trim prefixOverrides="and" prefix="">

base-manager/src/test/java/com/mortals/httpclient/base/BaseAreaController.http

@@ -54,7 +54,7 @@ POST {{baseUrl}}/base/area/genSubAreaByAreaName
 Content-Type: application/json
 
 {
-  "areaCode": "511700000000"
+  "areaCode": "511715000000"
 }
 
 

base-manager/src/test/java/com/mortals/httpclient/http-client.env.json

@@ -13,6 +13,10 @@
     "baseUrl": "http://192.168.0.250:11071/base"
   },
 
+  "base-qiling": {
+    "baseUrl": "http://192.168.0.239:11071/base"
+  },
+
   "base-yanyuan-test": {
     "baseUrl": "http://192.168.0.119:11078/base"
   },

base-manager/src/test/java/com/mortals/httpclient/matter/MatterDatumController.http

+POST {{baseUrl}}/matter/datum/importData
+Content-Type: multipart/form-data; boundary=WebAppBoundary
+
+--WebAppBoundary
+Content-Disposition: form-data; name="批量导入材料模板"; filename="批量导入材料模板.xlsx"
+
+< E:/批量导入材料模板.xlsx
+--WebAppBoundary--
+
+###
+
+
+###自定义导入
+POST {{baseUrl}}/matter/datum/importData
+Content-Type: multipart/form-data; boundary=WebAppBoundary
+
+--WebAppBoundary
+Content-Disposition: form-data; name="file"; filename="批量导入材料模板.xlsx"
+
+< ./批量导入材料模板.xlsx
+--WebAppBoundary--
 
 ###事项申请材料列表
 POST {{baseUrl}}/matter/datum/list
@@ -73,4 +94,9 @@ Accept: application/json
 
 
 
+###downloadTemplate
+POST {{baseUrl}}/matter/datum/downloadTemplate
+Content-Type: application/json
+
+
 

base-manager/src/test/java/com/mortals/httpclient/site/SiteController.http

@@ -146,7 +146,7 @@ POST {{baseUrl}}/site/syncGovMatterBySiteId
 Content-Type: application/json
 
 {
-  "id":8
+  "id":1
 }
 
 

base-manager/src/test/java/com/mortals/httpclient/window/WindowController.http

@@ -72,7 +72,6 @@ Accept: application/json
 ###模板导出
 POST {{baseUrl}}/window/downloadTemplate
 Content-Type: application/json
-Authorization: {{authToken}}
 
 
 

smart-gateway/src/main/resources/bootstrap.yml

@@ -170,6 +170,15 @@ spring:
           metadata:
             response-timeout: 200000
             connect-timeout: 200000
+        # 代办帮办
+        - id: agent-manager
+          #uri: http://192.168.0.98:21080
+          uri: lb://agent-manager
+          predicates:
+            - Path=/agent/**
+          metadata:
+            response-timeout: 200000
+            connect-timeout: 200000
     nacos:
       # Nacos 作为注册中心的配置项，对应 NacosDiscoveryProperties 配置类
       discovery: