fdd 户配置 代码修改

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/FddContractAttachInfo.java

@@ -29,7 +29,6 @@ import org.hibernate.validator.constraints.Length;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -119,7 +118,7 @@ public class FddContractAttachInfo extends BaseEntity {
      */
     @Schema(description ="工作地点")
 	@Length(max=200,message = "工作地点不能超过200个字符")
-	@ExcelAttribute(name = "工作地点" , maxLength = 200 )
+	@ExcelAttribute(name = "工作地点",isNotEmpty = true, errorInfo = "工作地点不能为空", maxLength = 200 )
     private String workSpace;
 
     /**
@@ -164,8 +163,8 @@ public class FddContractAttachInfo extends BaseEntity {
     /**
      * 身份证号码
      */
-    @Schema(description ="身份证号码")
-	@ExcelAttribute(name = "身份证号码", isNotEmpty = true, errorInfo = "身份证号码不能为空", maxLength = 32, needExport = true)
+    @Schema(description ="身份证号")
+	@ExcelAttribute(name = "身份证号", isNotEmpty = true, errorInfo = "身份证号不能为空", maxLength = 32, needExport = true)
 	private String empIdcard;
 
     /**
@@ -177,8 +176,16 @@ public class FddContractAttachInfo extends BaseEntity {
     /**
      * 结算主体编码
      */
-    @Schema(description ="结算主体编码")
-    private String departNo;
+    @Schema(description ="项目编码")
+	@ExcelAttribute(name = "项目编码", isNotEmpty = true, errorInfo = "项目编码不能为空", maxLength = 20, needExport = true)
+	private String departNo;
+
+	/**
+	 * 员工类型
+	 */
+	@Schema(description ="员工类型")
+	@ExcelAttribute(name = "员工类型", isDataId = true, errorInfo = "员工类型不能为空", maxLength = 20)
+	private String empNatrue;
 
 	/**
 	 * 结算主体名称

yifu-archives/yifu-archives-biz/pom.xml

@@ -67,6 +67,11 @@
 			<version>1.8.0</version>
 			<artifactId>fadada-java-sdk-api3</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpmime</artifactId>
+			<version>4.5.6</version>
+		</dependency>
 		<dependency>
 			<groupId>cn.hutool</groupId>
 			<version>5.8.0</version>

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/FddContractTemplateController.java

@@ -17,12 +17,10 @@
 
 package com.yifu.cloud.plus.v1.yifu.archives.controller;
 
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fadada.api.exception.ApiException;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.FddContractTemplate;
 import com.yifu.cloud.plus.v1.yifu.archives.service.FddContractTemplateService;
-import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -36,7 +34,6 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.validation.Valid;
 import java.io.IOException;
-import java.time.LocalDateTime;
 
 
 /**
@@ -87,7 +84,7 @@ public class FddContractTemplateController {
     @PutMapping
     @PreAuthorize("@pms.hasPermission('demo_fddcontracttemplate_edit')" )
     public R updateById(@RequestBody FddContractTemplate fddContractTemplate) {
-        return R.ok(fddContractTemplateService.changeInfo(fddContractTemplate));
+        return fddContractTemplateService.changeInfo(fddContractTemplate);
     }
 
     /**

yifu-archives/yifu-archives-biz/src/main/resources/mapper/FddContractTemplateMapper.xml

@@ -108,6 +108,7 @@
 			1=1
 			<include refid="fddContractTemplate_where"/>
 		</where>
+		order by a.CREATE_TIME desc
 	</select>
 
 	<update id="updateTeFddTemplateNull">

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/SysHouseHoldInfo.java

@@ -65,30 +65,6 @@ public class SysHouseHoldInfo extends BaseEntity {
     @ExcelProperty("户名")
     private String name;
 
-    /**
-     * 创建时间
-     */
-    @ExcelAttribute(name = "创建时间" )
-    @Schema(description ="创建时间")
-    @ExcelProperty("创建时间")
-    private LocalDateTime createTime;
-
-    /**
-     * 创建人ID
-     */
-    @ExcelAttribute(name = "创建人ID" )
-    @Schema(description ="创建人ID")
-    @ExcelProperty("创建人ID")
-    private String createUser;
-
-    /**
-     * 创建人姓名
-     */
-    @ExcelAttribute(name = "创建人姓名" )
-    @Schema(description ="创建人姓名")
-    @ExcelProperty("创建人姓名")
-    private String createUserName;
-
     /**
      * 0启用1禁用
      */
@@ -145,37 +121,4 @@ public class SysHouseHoldInfo extends BaseEntity {
     @ExcelProperty("所属机构名称")
     private String organName;
 
-    /**
-     * 创建者
-     */
-    @ExcelAttribute(name = "创建者" )
-    @Schema(description ="创建者")
-    @ExcelProperty("创建者")
-    private String createBy;
-
-    /**
-     * 更新人
-     */
-    @ExcelAttribute(name = "更新人" )
-    @Schema(description ="更新人")
-    @ExcelProperty("更新人")
-    private String updateBy;
-
-    /**
-     * 创建人姓名
-     */
-    @ExcelAttribute(name = "创建人姓名" )
-    @Schema(description ="创建人姓名")
-    @ExcelProperty("创建人姓名")
-    private String createName;
-
-    /**
-     * 更新时间
-     */
-    @ExcelAttribute(name = "更新时间" )
-    @Schema(description ="更新时间")
-    @ExcelProperty("更新时间")
-    private LocalDateTime updateTime;
-
-
 }

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TAgentConfig.java

@@ -26,8 +26,6 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.time.LocalDateTime;
-
 /**
  * 预估临时政策配置表
  *
@@ -129,22 +127,6 @@ public class TAgentConfig extends BaseEntity {
     @ExcelProperty("适用年")
     private String year;
 
-    /**
-     * createTime
-     */
-    @ExcelAttribute(name = "createTime" )
-    @Schema(description ="createTime")
-    @ExcelProperty("createTime")
-    private LocalDateTime createTime;
-
-    /**
-     * createUser
-     */
-    @ExcelAttribute(name = "createUser" )
-    @Schema(description ="createUser")
-    @ExcelProperty("createUser")
-    private String createUser;
-
     /**
      * 生效起月份 包含
      */

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TAgentConfigController.java

@@ -68,7 +68,6 @@ public class TAgentConfigController {
      */
     @Operation(summary = "不分页查询", description = "不分页查询")
     @PostMapping("/noPage" )
-    //@PreAuthorize("@pms.hasPermission('demo_tagentconfig_get')" )
     public R<List<TAgentConfig>> getTAgentConfigNoPage(@RequestBody TAgentConfig tAgentConfig) {
         return R.ok(tAgentConfigService.list(Wrappers.query(tAgentConfig)));
     }
@@ -78,7 +77,7 @@ public class TAgentConfigController {
      * @param id id
      * @return R
      */
-    @Operation(summary = "通过id查询", description = "通过id查询：hasPermission('demo_tagentconfig_get')")
+    @Operation(summary = "通过id查询", description = "通过id查询")
     @GetMapping("/{id}" )
     public R<TAgentConfig> getById(@PathVariable("id" ) String id) {
         return R.ok(tAgentConfigService.getById(id));
@@ -89,7 +88,7 @@ public class TAgentConfigController {
      * @param tAgentConfig 预估临时政策配置表
      * @return R
      */
-    @Operation(summary = "新增预估临时政策配置表", description = "新增预估临时政策配置表：hasPermission('demo_tagentconfig_add')")
+    @Operation(summary = "新增预估临时政策配置表", description = "新增预估临时政策配置表：hasPermission('social_tagentconfig_add')")
     @SysLog("新增预估临时政策配置表" )
     @PostMapping
     @PreAuthorize("@pms.hasPermission('social_tagentconfig_add')" )
@@ -102,7 +101,7 @@ public class TAgentConfigController {
      * @param tAgentConfig 预估临时政策配置表
      * @return R
      */
-    @Operation(summary = "修改预估临时政策配置表", description = "修改预估临时政策配置表：hasPermission('demo_tagentconfig_edit')")
+    @Operation(summary = "修改预估临时政策配置表", description = "修改预估临时政策配置表：hasPermission('social_tagentconfig_edit')")
     @SysLog("修改预估临时政策配置表" )
     @PutMapping
     @PreAuthorize("@pms.hasPermission('social_tagentconfig_edit')" )
@@ -115,7 +114,7 @@ public class TAgentConfigController {
      * @param id id
      * @return R
      */
-    @Operation(summary = "通过id删除预估临时政策配置表", description = "通过id删除预估临时政策配置表：hasPermission('demo_tagentconfig_del')")
+    @Operation(summary = "通过id删除预估临时政策配置表", description = "通过id删除预估临时政策配置表：hasPermission('social_tagentconfig_del')")
     @SysLog("通过id删除预估临时政策配置表" )
     @DeleteMapping("/{id}" )
     @PreAuthorize("@pms.hasPermission('social_tagentconfig_del')" )
@@ -128,9 +127,9 @@ public class TAgentConfigController {
 	 * @param id
 	 * @return R
 	 */
-	@Operation(summary = "通过id删除预估临时政策配置表", description = "通过id删除预估临时政策配置表：hasPermission('demo_tagentconfig_del')")
+	@Operation(summary = "通过id删除预估临时政策配置表", description = "通过id删除预估临时政策配置表：hasPermission('social_tagentconfig_del')")
 	@PostMapping("/updateOpenFlagById")
-	@PreAuthorize("@pms.hasPermission('social:tagentconfig_edit')")
+	@PreAuthorize("@pms.hasPermission('social_tagentconfig_edit')")
 	public R updateOpenFlagById(@RequestParam String id) {
 		return tAgentConfigService.updateFlagById(id);
 	}

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

@@ -28,8 +28,6 @@
     <result property="organId" column="ORGAN_ID"/>
     <result property="name" column="NAME"/>
     <result property="createTime" column="CREATE_TIME"/>
-    <result property="createUser" column="CREATE_USER"/>
-    <result property="createUserName" column="CREATE_USER_NAME"/>
     <result property="delFlag" column="DEL_FLAG"/>
     <result property="type" column="TYPE"/>
     <result property="province" column="PROVINCE"/>
@@ -40,6 +38,7 @@
     <result property="createBy" column="CREATE_BY"/>
     <result property="updateBy" column="UPDATE_BY"/>
     <result property="createName" column="CREATE_NAME"/>
+    <result property="createTime" column="CREATE_TIME"/>
     <result property="updateTime" column="UPDATE_TIME"/>
   </resultMap>
     <sql id="Base_Column_List">
@@ -47,8 +46,6 @@
                 a.ORGAN_ID,
                 a.NAME,
                 a.CREATE_TIME,
-                a.CREATE_USER,
-                a.CREATE_USER_NAME,
                 a.DEL_FLAG,
                 a.TYPE,
                 a.PROVINCE,
@@ -75,12 +72,6 @@
                     <if test="sysHouseHoldInfo.createTime != null">
                         AND a.CREATE_TIME = #{sysHouseHoldInfo.createTime}
                     </if>
-                    <if test="sysHouseHoldInfo.createUser != null and sysHouseHoldInfo.createUser.trim() != ''">
-                        AND a.CREATE_USER = #{sysHouseHoldInfo.createUser}
-                    </if>
-                    <if test="sysHouseHoldInfo.createUserName != null and sysHouseHoldInfo.createUserName.trim() != ''">
-                        AND a.CREATE_USER_NAME = #{sysHouseHoldInfo.createUserName}
-                    </if>
                     <if test="sysHouseHoldInfo.delFlag != null and sysHouseHoldInfo.delFlag.trim() != ''">
                         AND a.DEL_FLAG = #{sysHouseHoldInfo.delFlag}
                     </if>

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

@@ -35,8 +35,11 @@
     <result property="pension" column="PENSION"/>
     <result property="unemployed" column="UNEMPLOYED"/>
     <result property="year" column="YEAR"/>
+    <result property="createBy" column="CREATE_BY"/>
+    <result property="updateBy" column="UPDATE_BY"/>
+    <result property="createName" column="CREATE_NAME"/>
     <result property="createTime" column="CREATE_TIME"/>
-    <result property="createUser" column="CREATE_USER"/>
+    <result property="updateTime" column="UPDATE_TIME"/>
     <result property="startMonth" column="START_MONTH"/>
     <result property="endMonth" column="END_MONTH"/>
   </resultMap>
@@ -52,10 +55,13 @@
                 a.PENSION,
                 a.UNEMPLOYED,
                 a.YEAR,
-                a.CREATE_TIME,
-                a.CREATE_USER,
                 a.START_MONTH,
-                a.END_MONTH
+                a.END_MONTH,
+				a.CREATE_BY,
+				a.UPDATE_BY,
+				a.CREATE_NAME,
+				a.CREATE_TIME,
+				a.UPDATE_TIME
     </sql>
     <sql id="tAgentConfig_where">
         <if test="tAgentConfig != null">
@@ -92,18 +98,27 @@
                     <if test="tAgentConfig.year != null and tAgentConfig.year.trim() != ''">
                         AND a.YEAR = #{tAgentConfig.year}
                     </if>
-                    <if test="tAgentConfig.createTime != null">
-                        AND a.CREATE_TIME = #{tAgentConfig.createTime}
-                    </if>
-                    <if test="tAgentConfig.createUser != null and tAgentConfig.createUser.trim() != ''">
-                        AND a.CREATE_USER = #{tAgentConfig.createUser}
-                    </if>
                     <if test="tAgentConfig.startMonth != null and tAgentConfig.startMonth.trim() != ''">
                         AND a.START_MONTH = #{tAgentConfig.startMonth}
                     </if>
                     <if test="tAgentConfig.endMonth != null and tAgentConfig.endMonth.trim() != ''">
                         AND a.END_MONTH = #{tAgentConfig.endMonth}
                     </if>
+					<if test="tAgentConfig.createBy != null and tAgentConfig.createBy.trim() != ''">
+						AND a.CREATE_BY = #{tAgentConfig.createBy}
+					</if>
+					<if test="tAgentConfig.updateBy != null and tAgentConfig.updateBy.trim() != ''">
+						AND a.UPDATE_BY = #{tAgentConfig.updateBy}
+					</if>
+					<if test="tAgentConfig.createName != null and tAgentConfig.createName.trim() != ''">
+						AND a.CREATE_NAME = #{tAgentConfig.createName}
+					</if>
+					<if test="tAgentConfig.createTime != null">
+						AND a.CREATE_TIME = #{tAgentConfig.createTime}
+					</if>
+					<if test="tAgentConfig.updateTime != null">
+						AND a.UPDATE_TIME = #{tAgentConfig.updateTime}
+					</if>
         </if>
     </sql>
     <!--tAgentConfig简单分页查询-->