Merge remote-tracking branch 'origin/MVP1.5.6' into MVP1.5.6

yifu-msg/yifu-msg-api/src/main/java/com/yifu/cloud/plus/v1/msg/entity/TMessageInfo.java

+/*
+ *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the yifu4cloud.com developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: lengleng (wangiegie@gmail.com)
+ */
+
+package com.yifu.cloud.plus.v1.msg.entity;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.validator.constraints.Length;
+
+import java.util.Date;
+
+/**
+ * 消息提醒
+ *
+ * @author huyc
+ * @date 2023-07-26 14:19:33
+ */
+@Data
+@TableName("t_message_info")
+@EqualsAndHashCode()
+@Schema(description = "消息提醒")
+public class TMessageInfo {
+
+	/**
+	 * ID
+	 */
+	@TableId(type = IdType.ASSIGN_ID)
+	@ExcelProperty("ID")
+	@Schema(description = "ID")
+	private String id;
+	/**
+	 * 提交人-表单制作人
+	 */
+	@ExcelAttribute(name = "提交人-表单制作人", maxLength = 10)
+	@Length(max = 10, message = "提交人-表单制作人不能超过10个字符")
+	@ExcelProperty("提交人-表单制作人")
+	@Schema(description = "提交人-表单制作人")
+	private String submitUser;
+	/**
+	 * 0 待办 1 待阅
+	 */
+	@ExcelAttribute(name = "0 待办 1 待阅", maxLength = 1)
+	@Length(max = 1, message = "0 待办 1 待阅不能超过1个字符")
+	@ExcelProperty("0 待办 1 待阅")
+	@Schema(description = "0 待办 1 待阅")
+	private String alertType;
+	/**
+	 * 0 已处理 1 未处理
+	 */
+	@ExcelAttribute(name = "0 已处理 1 未处理", maxLength = 1)
+	@Length(max = 1, message = "0 已处理 1 未处理不能超过1个字符")
+	@ExcelProperty("0 已处理 1 未处理")
+	@Schema(description = "0 已处理 1 未处理")
+	private String handlerStatus;
+	/**
+	 * 处理人-当前提醒人
+	 */
+	@ExcelAttribute(name = "处理人-当前提醒人", maxLength = 10)
+	@Length(max = 10, message = "处理人-当前提醒人不能超过10个字符")
+	@ExcelProperty("处理人-当前提醒人")
+	@Schema(description = "处理人-当前提醒人")
+	private String alertUser;
+	/**
+	 * listUrl
+	 */
+	@ExcelAttribute(name = "listUrl", maxLength = 200)
+	@Length(max = 200, message = "listUrl不能超过200个字符")
+	@ExcelProperty("listUrl")
+	@Schema(description = "listUrl")
+	private String listUrl;
+	/**
+	 * infoUrl
+	 */
+	@ExcelAttribute(name = "infoUrl", maxLength = 200)
+	@Length(max = 200, message = "infoUrl不能超过200个字符")
+	@ExcelProperty("infoUrl")
+	@Schema(description = "infoUrl")
+	private String infoUrl;
+	/**
+	 * 模块
+	 */
+	@ExcelAttribute(name = "模块", maxLength = 20)
+	@Length(max = 20, message = "模块不能超过20个字符")
+	@ExcelProperty("模块")
+	@Schema(description = "模块")
+	private String modelType;
+	/**
+	 * 关联id
+	 */
+	@ExcelAttribute(name = "关联id", maxLength = 32)
+	@Length(max = 32, message = "关联id不能超过32个字符")
+	@ExcelProperty("关联id")
+	@Schema(description = "关联id")
+	private String modelId;
+	/**
+	 * 创建时间
+	 */
+	@ExcelAttribute(name = "创建时间", isDate = true)
+	@ExcelProperty("创建时间")
+	@Schema(description = "创建时间")
+	private Date createTime;
+
+}

yifu-msg/yifu-msg-biz/src/main/java/com/yifu/cloud/plus/v1/msg/controller/TMessageInfoController.java

+/*
+ *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the yifu4cloud.com developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: lengleng (wangiegie@gmail.com)
+ */
+
+package com.yifu.cloud.plus.v1.msg.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yifu.cloud.plus.v1.msg.entity.TMessageInfo;
+import com.yifu.cloud.plus.v1.msg.service.TMessageInfoService;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
+import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
+import com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+
+/**
+ * 消息提醒
+ *
+ * @author huyc
+ * @date 2023-07-26 14:19:33
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/tmessageinfo" )
+@Tag(name = "消息提醒管理")
+public class TMessageInfoController {
+
+    private final TMessageInfoService tMessageInfoService;
+
+    /**
+     * 简单分页查询
+     * @param page 分页对象
+     * @param tMessageInfo 消息提醒
+     * @return
+     */
+    @Operation(description = "简单分页查询")
+    @GetMapping("/page")
+    public R<IPage<TMessageInfo>> getTMessageInfoPage(Page<TMessageInfo> page, TMessageInfo tMessageInfo) {
+        return new R<>(tMessageInfoService.getTMessageInfoPage(page,tMessageInfo));
+    }
+
+    /**
+     * 通过id查询消息提醒
+     * @param id id
+     * @return R
+     */
+    @Operation(summary = "通过id查询", description = "通过id查询")
+    @GetMapping("/{id}" )
+    @PreAuthorize("@pms.hasPermission('demo_tmessageinfo_get')" )
+    public R<TMessageInfo> getById(@PathVariable("id" ) String id) {
+        return R.ok(tMessageInfoService.getById(id));
+    }
+
+    /**
+     * 新增消息提醒
+     * @param tMessageInfo 消息提醒
+     * @return R
+     */
+    @Operation(summary = "新增消息提醒", description = "新增消息提醒")
+    @SysLog("新增消息提醒" )
+    @PostMapping
+    @PreAuthorize("@pms.hasPermission('demo_tmessageinfo_add')" )
+    public R<Boolean> save(@RequestBody TMessageInfo tMessageInfo) {
+        return R.ok(tMessageInfoService.save(tMessageInfo));
+    }
+
+    /**
+     * 修改消息提醒
+     * @param tMessageInfo 消息提醒
+     * @return R
+     */
+    @Operation(summary = "修改消息提醒", description = "修改消息提醒")
+    @SysLog("修改消息提醒" )
+    @PutMapping
+    @PreAuthorize("@pms.hasPermission('demo_tmessageinfo_edit')" )
+    public R<Boolean> updateById(@RequestBody TMessageInfo tMessageInfo) {
+        return R.ok(tMessageInfoService.updateById(tMessageInfo));
+    }
+
+	/**
+	 * @Author huyc
+	 * @Description 更新消息信息
+	 * @Date 14:30 2023/7/26
+	 * @Param
+	 * @return
+	 **/
+	@Operation(summary = "更新消息信息", description = "更新消息信息")
+	@Inner
+	@PostMapping("/inner/updateMessageInfo")
+	public void updateMessageInfo(@RequestBody TMessageInfo tMessageInfo) {
+		tMessageInfoService.updateMessageInfo(tMessageInfo);
+	}
+
+	/**
+	 * @Author huyc
+	 * @Description 查询消息数量
+	 * @Date 14:30 2023/7/26
+	 * @Param
+	 * @return
+	 **/
+	@Operation(summary = "查询消息数量", description = "查询消息数量")
+	@PostMapping("/selectMessageCount")
+	public long selectMessageCount(@RequestBody TMessageInfo tMessageInfo) {
+		return tMessageInfoService.selectMessageCount(tMessageInfo);
+	}
+
+    /**
+     * 通过id删除消息提醒
+     * @param id id
+     * @return R
+     */
+    @Operation(summary = "通过id删除消息提醒", description = "通过id删除消息提醒")
+    @SysLog("通过id删除消息提醒" )
+    @DeleteMapping("/{id}" )
+    @PreAuthorize("@pms.hasPermission('demo_tmessageinfo_del')" )
+    public R<Boolean> removeById(@PathVariable String id) {
+        return R.ok(tMessageInfoService.removeById(id));
+    }
+}

yifu-msg/yifu-msg-biz/src/main/java/com/yifu/cloud/plus/v1/msg/mapper/TMessageInfoMapper.java

+/*
+ *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the yifu4cloud.com developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: lengleng (wangiegie@gmail.com)
+ */
+
+package com.yifu.cloud.plus.v1.msg.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yifu.cloud.plus.v1.msg.entity.TMessageInfo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 消息提醒
+ *
+ * @author huyc
+ * @date 2023-07-26 14:19:33
+ */
+@Mapper
+public interface TMessageInfoMapper extends BaseMapper<TMessageInfo> {
+    /**
+     * 消息提醒简单分页查询
+     * @param tMessageInfo 消息提醒
+     * @return
+     */
+    IPage<TMessageInfo> getTMessageInfoPage(Page<TMessageInfo> page, @Param("tMessageInfo") TMessageInfo tMessageInfo);
+}

yifu-msg/yifu-msg-biz/src/main/java/com/yifu/cloud/plus/v1/msg/service/TMessageInfoService.java

+/*
+ *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the yifu4cloud.com developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: lengleng (wangiegie@gmail.com)
+ */
+
+package com.yifu.cloud.plus.v1.msg.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yifu.cloud.plus.v1.msg.entity.TMessageInfo;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * 消息提醒
+ *
+ * @author huyc
+ * @date 2023-07-26 14:19:33
+ */
+public interface TMessageInfoService extends IService<TMessageInfo> {
+    /**
+     * 消息提醒简单分页查询
+     * @param tMessageInfo 消息提醒
+     * @return
+     */
+    IPage<TMessageInfo> getTMessageInfoPage(Page<TMessageInfo> page, TMessageInfo tMessageInfo);
+
+	void updateMessageInfo(@RequestBody TMessageInfo tMessageInfo);
+
+	long selectMessageCount(@RequestBody TMessageInfo tMessageInfo);
+}

yifu-msg/yifu-msg-biz/src/main/java/com/yifu/cloud/plus/v1/msg/service/impl/TMessageInfoServiceImpl.java

+/*
+ *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the yifu4cloud.com developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: lengleng (wangiegie@gmail.com)
+ */
+package com.yifu.cloud.plus.v1.msg.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yifu.cloud.plus.v1.msg.entity.TMessageInfo;
+import com.yifu.cloud.plus.v1.msg.mapper.TMessageInfoMapper;
+import com.yifu.cloud.plus.v1.msg.service.TMessageInfoService;
+import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.stereotype.Service;
+
+/**
+ * 消息提醒
+ *
+ * @author huyc
+ * @date 2023-07-26 14:19:33
+ */
+@Log4j2
+@Service
+public class TMessageInfoServiceImpl extends ServiceImpl<TMessageInfoMapper, TMessageInfo> implements TMessageInfoService {
+    /**
+     * 消息提醒简单分页查询
+     * @param tMessageInfo 消息提醒
+     * @return
+     */
+    @Override
+    public IPage<TMessageInfo> getTMessageInfoPage(Page<TMessageInfo> page, TMessageInfo tMessageInfo){
+        return baseMapper.getTMessageInfoPage(page,tMessageInfo);
+    }
+
+	@Override
+	public void updateMessageInfo(TMessageInfo tMessageInfo) {
+		if (Common.isNotNull(tMessageInfo) && Common.isNotNull(tMessageInfo.getAlertUser())) {
+			TMessageInfo tMessageInfo1 = null;
+			if (Common.isNotNull(tMessageInfo.getModelId())) {
+				tMessageInfo1 = baseMapper.selectOne(Wrappers.<TMessageInfo>query().lambda()
+						.eq(TMessageInfo::getAlertUser, tMessageInfo.getAlertUser())
+						.eq(TMessageInfo::getModelId, tMessageInfo.getModelId())
+						.orderByDesc(TMessageInfo::getCreateTime).last(CommonConstants.LAST_ONE_SQL));
+			} else if (Common.isNotNull(tMessageInfo.getInfoUrl())){
+				tMessageInfo1 = baseMapper.selectOne(Wrappers.<TMessageInfo>query().lambda()
+						.eq(TMessageInfo::getAlertUser, tMessageInfo.getAlertUser())
+						.eq(TMessageInfo::getInfoUrl, tMessageInfo.getInfoUrl())
+						.orderByDesc(TMessageInfo::getCreateTime).last(CommonConstants.LAST_ONE_SQL));
+			}
+			if (Common.isNotNull(tMessageInfo1)) {
+				tMessageInfo1.setHandlerStatus(tMessageInfo.getHandlerStatus());
+			}
+		}
+	}
+
+	@Override
+	public long selectMessageCount(TMessageInfo tMessageInfo) {
+		return baseMapper.selectCount(Wrappers.<TMessageInfo>query().lambda()
+				.eq(TMessageInfo::getAlertUser,tMessageInfo.getAlertUser())
+				.eq(TMessageInfo::getModelId,tMessageInfo.getModelId())
+				.eq(TMessageInfo::getHandlerStatus,CommonConstants.ONE_STRING));
+	}
+}

yifu-msg/yifu-msg-biz/src/main/resources/mapper/TMessageInfoMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~
+  ~      Copyright (c) 2018-2025, lengleng All rights reserved.
+  ~
+  ~  Redistribution and use in source and binary forms, with or without
+  ~  modification, are permitted provided that the following conditions are met:
+  ~
+  ~ Redistributions of source code must retain the above copyright notice,
+  ~  this list of conditions and the following disclaimer.
+  ~  Redistributions in binary form must reproduce the above copyright
+  ~  notice, this list of conditions and the following disclaimer in the
+  ~  documentation and/or other materials provided with the distribution.
+  ~  Neither the name of the yifu4cloud.com developer nor the names of its
+  ~  contributors may be used to endorse or promote products derived from
+  ~  this software without specific prior written permission.
+  ~  Author: lengleng (wangiegie@gmail.com)
+  ~
+  -->
+
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.yifu.cloud.plus.v1.msg.mapper.TMessageInfoMapper">
+
+  <resultMap id="tMessageInfoMap" type="com.yifu.cloud.plus.v1.msg.entity.TMessageInfo">
+    <id property="id" column="ID"/>
+    <result property="submitUser" column="SUBMIT_USER"/>
+    <result property="alertType" column="ALERT_TYPE"/>
+    <result property="handlerStatus" column="HANDLER_STATUS"/>
+    <result property="alertUser" column="ALERT_USER"/>
+    <result property="listUrl" column="LIST_URL"/>
+    <result property="infoUrl" column="INFO_URL"/>
+    <result property="modelType" column="MODEL_TYPE"/>
+    <result property="modelId" column="MODEL_ID"/>
+    <result property="createTime" column="CREATE_TIME"/>
+  </resultMap>
+    <sql id="Base_Column_List">
+                a.ID,
+                a.SUBMIT_USER,
+                a.ALERT_TYPE,
+                a.HANDLER_STATUS,
+                a.ALERT_USER,
+                a.LIST_URL,
+                a.INFO_URL,
+                a.MODEL_TYPE,
+                a.MODEL_ID,
+                a.CREATE_TIME
+    </sql>
+    <sql id="tMessageInfo_where">
+        <if test="tMessageInfo != null">
+                    <if test="tMessageInfo.submitUser != null and tMessageInfo.submitUser.trim() != ''">
+                        AND a.SUBMIT_USER = #{tMessageInfo.submitUser}
+                    </if>
+                    <if test="tMessageInfo.alertType != null and tMessageInfo.alertType.trim() != ''">
+                        AND a.ALERT_TYPE = #{tMessageInfo.alertType}
+                    </if>
+                    <if test="tMessageInfo.handlerStatus != null and tMessageInfo.handlerStatus.trim() != ''">
+                        AND a.HANDLER_STATUS = #{tMessageInfo.handlerStatus}
+                    </if>
+                    <if test="tMessageInfo.alertUser != null and tMessageInfo.alertUser.trim() != ''">
+                        AND a.ALERT_USER = #{tMessageInfo.alertUser}
+                    </if>
+                    <if test="tMessageInfo.infoUrl != null and tMessageInfo.infoUrl.trim() != ''">
+                        AND a.INFO_URL = #{tMessageInfo.infoUrl}
+                    </if>
+					<if test="tMessageInfo.listUrl != null and tMessageInfo.listUrl.trim() != ''">
+						AND a.LIST_URL = #{tMessageInfo.listUrl}
+					</if>
+                    <if test="tMessageInfo.modelType != null and tMessageInfo.modelType.trim() != ''">
+                        AND a.MODEL_TYPE = #{tMessageInfo.modelType}
+                    </if>
+        </if>
+    </sql>
+    <!--tMessageInfo简单分页查询-->
+    <select id="getTMessageInfoPage" resultMap="tMessageInfoMap">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM t_message_info a
+        <where>
+            1=1
+            <include refid="tMessageInfo_where"/>
+        </where>
+		order by a.CREATE_TIME desc
+    </select>
+</mapper>

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TDispatchSocialPersionExportVo.java

@@ -18,7 +18,6 @@ package com.yifu.cloud.plus.v1.yifu.social.vo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
-import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -73,7 +72,7 @@ public class TDispatchSocialPersionExportVo implements Serializable {
 	 * 民族
 	 */
 	@Schema(description = "民族")
-	@ExcelAttribute(name = "民族", isDataId = true,dataType = ExcelAttributeConstants.EMP_NATIONAL)
+	@ExcelAttribute(name = "民族")
 	@ExcelProperty("民族")
 	private String empNational;
 	/**

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TDispatchSocialPersionReduceExportVo.java

@@ -101,7 +101,17 @@ public class TDispatchSocialPersionReduceExportVo implements Serializable {
 	@Schema(description = "劳改" )
 	@ExcelAttribute(name = "劳改" )
 	@ExcelProperty("劳改")
-	private String typeE;	/**
+	private String typeE;
+
+	/**
+	 * 劳教
+	 */
+	@Schema(description = "劳教" )
+	@ExcelAttribute(name = "劳教" )
+	@ExcelProperty("劳教")
+	private String typeW;
+
+	/**
 	 * 劳教
 	 */
 	@Schema(description = "除名" )

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/config/CustomCellWriteWidthOneConfig.java

+package com.yifu.cloud.plus.v1.yifu.social.config;
+
+import com.alibaba.excel.metadata.Head;
+import com.alibaba.excel.metadata.data.WriteCellData;
+import com.alibaba.excel.write.metadata.holder.WriteSheetHolder;
+import com.alibaba.excel.write.style.column.AbstractColumnWidthStyleStrategy;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+public class CustomCellWriteWidthOneConfig extends AbstractColumnWidthStyleStrategy {
+
+
+	@Override
+	protected void setColumnWidth(WriteSheetHolder writeSheetHolder, List<WriteCellData<?>> cellDataList, Cell cell, Head head, Integer integer, Boolean isHead) {
+		boolean needSetWidth = isHead || !CollectionUtils.isEmpty(cellDataList);
+		if (needSetWidth) {
+			Sheet sheet = writeSheetHolder.getSheet();
+			int columnIndex = cell.getColumnIndex();
+			// 单元格文本长度大于45换行
+			if (columnIndex == 3) {
+				//要求将当前列的列宽设置为33英寸，理论值应该是33×256=8448，
+				//但是这里的设值是8648，具体原因请看下面的计算逻辑
+				sheet.setColumnWidth(0, 1000);
+				sheet.setColumnWidth(2, 3500);
+				sheet.setColumnWidth(3, 5000);
+				sheet.setColumnWidth(4, 1000);
+				sheet.setColumnWidth(6, 5000);
+				sheet.setColumnWidth(7, 4700);
+				sheet.setColumnWidth(9, 1000);
+				sheet.setColumnWidth(10, 1000);
+				sheet.setColumnWidth(11, 1000);
+				sheet.setColumnWidth(12, 1000);
+				sheet.setColumnWidth(13, 1000);
+				sheet.setColumnWidth(14, 1500);
+				sheet.setColumnWidth(15, 5000);
+				sheet.setColumnWidth(16, 3200);
+				sheet.setColumnWidth(17, 3000);
+			}
+		}
+	}
+}
\ No newline at end of file

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/config/CustomCellWriteWidthTwoConfig.java

+package com.yifu.cloud.plus.v1.yifu.social.config;
+
+import com.alibaba.excel.metadata.Head;
+import com.alibaba.excel.metadata.data.WriteCellData;
+import com.alibaba.excel.write.metadata.holder.WriteSheetHolder;
+import com.alibaba.excel.write.style.column.AbstractColumnWidthStyleStrategy;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+public class CustomCellWriteWidthTwoConfig extends AbstractColumnWidthStyleStrategy {
+
+
+	@Override
+	protected void setColumnWidth(WriteSheetHolder writeSheetHolder, List<WriteCellData<?>> cellDataList, Cell cell, Head head, Integer integer, Boolean isHead) {
+		boolean needSetWidth = isHead || !CollectionUtils.isEmpty(cellDataList);
+		if (needSetWidth) {
+			Sheet sheet = writeSheetHolder.getSheet();
+			int columnIndex = cell.getColumnIndex();
+			// 单元格文本长度大于45换行
+			if (columnIndex == 3) {
+				//要求将当前列的列宽设置为33英寸，理论值应该是33×256=8448，
+				//但是这里的设值是8648，具体原因请看下面的计算逻辑
+				sheet.setColumnWidth(0, 1000);
+				sheet.setColumnWidth(1, 4000);
+				sheet.setColumnWidth(3, 5000);
+				sheet.setColumnWidth(5, 1000);
+				sheet.setColumnWidth(6, 1000);
+				sheet.setColumnWidth(7, 1000);
+				sheet.setColumnWidth(8, 1000);
+				sheet.setColumnWidth(9, 1000);
+				sheet.setColumnWidth(10, 1000);
+				sheet.setColumnWidth(11, 1000);
+				sheet.setColumnWidth(12, 1500);
+				sheet.setColumnWidth(13, 1500);
+				sheet.setColumnWidth(14, 1500);
+				sheet.setColumnWidth(15, 1500);
+				sheet.setColumnWidth(16, 1500);
+				sheet.setColumnWidth(17, 1000);
+				sheet.setColumnWidth(18, 1000);
+				sheet.setColumnWidth(19, 1500);
+				sheet.setColumnWidth(20, 1500);
+				sheet.setColumnWidth(21, 1000);
+				sheet.setColumnWidth(22, 1000);
+				sheet.setColumnWidth(23, 4000);
+			}
+		}
+	}
+}
\ No newline at end of file

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java

@@ -2865,9 +2865,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 						&& (CommonConstants.THREE_STRING.equals(socialFund.getFundStatus())
 						|| CommonConstants.EIGHT_STRING.equals(socialFund.getFundStatus())
 						|| CommonConstants.ZERO_STRING.equals(socialFund.getFundStatus())
-						|| CommonConstants.ONE_STRING.equals(socialFund.getFundStatus())
-						|| CommonConstants.FIVE_STRING.equals(socialFund.getFundStatus())
-						|| CommonConstants.SIX_STRING.equals(socialFund.getFundStatus()))) {
+						|| CommonConstants.ONE_STRING.equals(socialFund.getFundStatus()))) {
 					errorMessageList1.add(new ErrorMessage(excel.getRowIndex(), excel.getEmpIdcard() + "-" +excel.getEmpName(), CommonConstants.RED, CommonConstants.ONE_STRING));
 				}
 			}
@@ -5269,12 +5267,13 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 					writeTable2 = EasyExcel.writerTable(2).
 							head(persionHead()).
 							registerWriteHandler(customCellStyleStrategyThree).
-							registerWriteHandler(new SimpleRowHeightStyleStrategy((short)25,(short)20))
+							registerWriteHandler(new CustomCellWriteWidthOneConfig()).
+							registerWriteHandler(new SimpleRowHeightStyleStrategy((short)30,(short)20))
 							.build();
 					writeTable3 = EasyExcel.writerTable(3).
 							head(persionHeadThree()).
 							registerWriteHandler(customCellStyleStrategyTwo).
-							registerWriteHandler(new SimpleRowHeightStyleStrategy((short)100,(short)20))
+							registerWriteHandler(new SimpleRowHeightStyleStrategy((short)150,(short)20))
 							.build();
 					writeTable4 = EasyExcel.writerTable(4).
 							head(persionHead1()).
@@ -5313,7 +5312,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 							listReduce.add(reduceVo);
 						}
 					}
-					List<Integer> columnIndexes = Arrays.asList(0,24);
+					List<Integer> columnIndexes = Arrays.asList(0,23);
 					CustomCellStyleStrategy customCellStyleStrategy = new CustomCellStyleStrategy(columnIndexes);
 					CustomCellStyleOneStrategy customCellStyleStrategyOne = new CustomCellStyleOneStrategy(columnIndexes);
 					CustomCellStyleTwoStrategy customCellStyleStrategyTwo = new CustomCellStyleTwoStrategy(columnIndexes);
@@ -5332,7 +5331,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 					writeTable2 = EasyExcel.writerTable(2).
 							head(persionReduceHead()).
 							registerWriteHandler(customCellStyleStrategyThree).
-							registerWriteHandler(new SimpleRowHeightStyleStrategy((short)25,(short)20))
+							registerWriteHandler(new CustomCellWriteWidthTwoConfig()).
+							registerWriteHandler(new SimpleRowHeightStyleStrategy((short)50,(short)20))
 							.build();
 					writeTable3 = EasyExcel.writerTable(3).
 							head(persionReduceHead1()).
@@ -6141,13 +6141,13 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		//表头数据
 		String a = "1、“户口性质”栏按下列类别填写：非农业户口（城镇）、本地非农业户口（本地城镇）、外地非农业户口（外地城镇）、农业户口（农村）、 \n" +
 				"          本地农业户口（本地农村）、外地农业户口（外地农村）、港澳台、外籍 \n" +
-				"	2、“个人身份”栏按下列类别填写：“企业职工”、“国家公务员”、“事业单位在编人员”、“编外人员”、“现役军人”、“协保人员”、“公益性岗位”“农民工医保” \n"  +
-				"	3、“参加保险险种”栏可对应选项打“√” \n"  +
-				"	4、新增人员（含断保再次缴费人员），个人月工资收入按起薪工资额申报。\n" +
-				"	5、补缴时段超过3个月的，缴费基数为历年安徽省社平工资，同时加征利息(含参保当月的缴费基数)。\n"  +
-				"	6、如属军队退役人员或劳模人员在备注栏中填写，“退役军人类别”栏按下列类别填写：军队转业干部、计划分配的军队转业干部、自主择业的军队转业干部、退伍复员军人、转业复员士官、退伍 \n" +
-				"	义务兵（含伤病残义务兵）、复员干部，“劳模级别”栏按下列类别填写：国家级、省（自治区、直辖市）级、部（委）级、地（市、厅、局）级、其他 \n" +
-				"	7、本表需填制一式两份，经办机构审核盖章后方可有效，一份单位自存，一份报市社会保险经办机构。";
+				"2、“个人身份”栏按下列类别填写：“企业职工”、“国家公务员”、“事业单位在编人员”、“编外人员”、“现役军人”、“协保人员”、“公益性岗位”“农民工医保” \n"  +
+				"3、“参加保险险种”栏可对应选项打“√” \n"  +
+				"4、新增人员（含断保再次缴费人员），个人月工资收入按起薪工资额申报。\n" +
+				"5、补缴时段超过3个月的，缴费基数为历年安徽省社平工资，同时加征利息(含参保当月的缴费基数)。\n"  +
+				"6、如属军队退役人员或劳模人员在备注栏中填写，“退役军人类别”栏按下列类别填写：军队转业干部、计划分配的军队转业干部、自主择业的军队转业干部、退伍复员军人、转业复员士官、退伍 \n" +
+				"义务兵（含伤病残义务兵）、复员干部，“劳模级别”栏按下列类别填写：国家级、省（自治区、直辖市）级、部（委）级、地（市、厅、局）级、其他 \n" +
+				"7、本表需填制一式两份，经办机构审核盖章后方可有效，一份单位自存，一份报市社会保险经办机构。";
 		//第一列-第十八列
 		for (int i =1;i<= 18;i++) {
 			list.add(Lists.newArrayList(a));
@@ -6183,7 +6183,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		//表头数据
 		String a=" 社 会 保 险 缴 费 单 位 人 员 减 少 花 名 册";
 		//第一列-第二十五列
-		for (int i =1;i<= 25;i++) {
+		for (int i =1;i<= 24;i++) {
 			list.add(Lists.newArrayList(a));
 		}
 		return list;
@@ -6200,7 +6200,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		//表头数据
 		String a="单位名称(签章): " + houseName + "                   单位编码:" + cusNo;
 		//第一列-第二十五列
-		for (int i =1;i<= 25;i++) {
+		for (int i =1;i<= 24;i++) {
 			list.add(Lists.newArrayList(a));
 		}
 		return list;
@@ -6248,7 +6248,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 				"2、本表需填制一式二份，经办机构审核盖章后方可有效，一份单位自存，一份报市社会保险经办机构。";
 		String b="填报人：                 单位联系电话：                  社保经办机构审核人：               " + "填报日期:  " + DateUtil.getYear(DateUtil.getCurrentDateTime())+ " 年" + " " + DateUtil.getMonth(DateUtil.getCurrentDateTime()) +" 月" + " " + DateUtil.getDay(DateUtil.getCurrentDateTime()) + " 日";
 		//第一列-第十八列
-		for (int i =1;i<= 25;i++) {
+		for (int i =1;i<= 24;i++) {
 			list.add(Lists.newArrayList(a,b));
 		}
 		return list;

yifu-social/yifu-social-biz/src/main/resources/mapper/SysHouseHoldInfoMapper.xml

@@ -85,7 +85,6 @@
 				a.FUND_BANK,
 				a.HANDLE_USER_NAME
     </sql>
-
     <sql id="sysHouseHoldInfo_where">
         <if test="sysHouseHoldInfo != null">
                     <if test="sysHouseHoldInfo.id != null and sysHouseHoldInfo.id.trim() != ''">
@@ -106,6 +105,9 @@
                     <if test="sysHouseHoldInfo.type != null and sysHouseHoldInfo.type.trim() != ''">
                         AND a.TYPE = #{sysHouseHoldInfo.type}
                     </if>
+					<if test="sysHouseHoldInfo.houseType != null and sysHouseHoldInfo.houseType.trim() != ''">
+						AND a.HOUSE_TYPE = #{sysHouseHoldInfo.houseType}
+					</if>
                     <if test="sysHouseHoldInfo.province != null and sysHouseHoldInfo.province.trim() != ''">
                         AND a.PROVINCE = #{sysHouseHoldInfo.province}
                     </if>

yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoMapper.xml

@@ -223,6 +223,7 @@
 		<result property="typeC" column="typeC"/>
 		<result property="typeD" column="typeD"/>
 		<result property="typeE" column="typeE"/>
+		<result property="typeW" column="typeW"/>
 		<result property="typeF" column="typeF"/>
 		<result property="typeG" column="typeG"/>
 		<result property="typeH" column="typeH"/>
@@ -1266,7 +1267,20 @@
 		WHEN 1 THEN '男'
 		WHEN 0 THEN '女'
 		END sex,
-		a.EMP_NATIONAL,
+		case when a.EMP_NATIONAL = 1 then "汉族"
+		when a.EMP_NATIONAL = 2 then "傣族"
+		when a.EMP_NATIONAL = 3 then "回族"
+		when a.EMP_NATIONAL = 4 then "未知"
+		when a.EMP_NATIONAL = 5 then "满族"
+		when a.EMP_NATIONAL = 6 then "壮族"
+		when a.EMP_NATIONAL = 7 then "黎族"
+		when a.EMP_NATIONAL = 8 then "蒙古族"
+		when a.EMP_NATIONAL = 9 then "白族"
+		when a.EMP_NATIONAL = 10 then "仫佬族"
+		when a.EMP_NATIONAL = 11 then "土家族"
+		when a.EMP_NATIONAL = 12 then "畬族"
+		when a.EMP_NATIONAL = 13 then "苗族"
+		else "汉族" end as EMP_NATIONAL,
 		concat(ifnull(DATE_FORMAT(a.CONTRACT_START,"%Y%m%d"),''),'-',ifnull(DATE_FORMAT(a.CONTRACT_END,"%Y%m%d"),'')) as WORK_DATE,
 		'非农业户口（城镇）' as type,
 		'企业职工' as SIGNLE_TYPE,
@@ -1310,6 +1324,7 @@
 		'' as typeC,
 		'' as typeD,
 		'' as typeE,
+		'' as typeW,
 		'' as typeF,
 		'' as typeG,
 		'' as typeH,