Merge branch 'feature/MVP1.0' into develop

pom.xml

@@ -102,6 +102,7 @@
         <module>yifu-insurances</module>
 		<module>yifu-salary</module>
         <module>yifu-order</module>
+		<module>yifu-mail</module>
 	</modules>
 
 	<dependencyManagement>

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

@@ -70,7 +70,19 @@ public class TSettleDomainController {
 	@Operation(summary = "分页查询", description = "分页查询")
 	@GetMapping("/page")
 	public R<IPage<TSettleDomain>> getTSettleDomainPage(Page<TSettleDomain> page, TSettleDomain tSettleDomain) {
-		return R.ok(tSettleDomainService.page(page, Wrappers.query(tSettleDomain)));
+		return R.ok(tSettleDomainService.getPage(page, tSettleDomain));
+	}
+
+	/**
+	 * 不分页查询
+	 *
+	 * @param tSettleDomain 项目表
+	 * @return
+	 */
+	@Operation(summary = "不分页查询", description = "不分页查询")
+	@GetMapping("/noPage")
+	public R<List<TSettleDomain>> getTSettleDomainNoPage(TSettleDomain tSettleDomain) {
+		return R.ok(tSettleDomainService.getList(tSettleDomain));
 	}
 
 

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/mapper/TSettleDomainMapper.java

@@ -40,6 +40,8 @@ public interface TSettleDomainMapper extends BaseMapper<TSettleDomain> {
 
 	IPage<TSettleDomain> getPage(Page<TSettleDomain> page, @Param("tSettleDomain") TSettleDomain tSettleDomain);
 
+	List<TSettleDomain> getPage(@Param("tSettleDomain") TSettleDomain tSettleDomain);
+
 	IPage<IdNameNoVo> getUnitPage(Page<IdNameNoVo> page, @Param("idNameNoVo") IdNameNoVo idNameNoVo);
 	/**
 	 * @param departNo

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TSettleDomainService.java

@@ -35,8 +35,25 @@ import java.util.List;
  */
 public interface TSettleDomainService extends IService<TSettleDomain> {
 
+	/**
+	 * @param page
+	 * @param tSettleDomain
+	 * @Description: 分页列表
+	 * @Author: hgw
+	 * @Date: 2022/12/1 14:22
+	 * @return: com.baomidou.mybatisplus.core.metadata.IPage<com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain>
+	 **/
 	IPage<TSettleDomain> getPage(Page<TSettleDomain> page, TSettleDomain tSettleDomain);
 
+	/**
+	 * @param tSettleDomain
+	 * @Description: 全部list
+	 * @Author: hgw
+	 * @Date: 2022/12/1 14:22
+	 * @return: java.util.List<com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain>
+	 **/
+	List<TSettleDomain> getList(TSettleDomain tSettleDomain);
+
 	/**
 	 * @param page
 	 * @param idNameNoVo

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TSettleDomainServiceImpl.java

@@ -72,6 +72,11 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
 		return baseMapper.getPage(page, tSettleDomain);
 	}
 
+	@Override
+	public List<TSettleDomain> getList(TSettleDomain tSettleDomain) {
+		return baseMapper.getPage(tSettleDomain);
+	}
+
 	@Override
 	public IPage<IdNameNoVo> getUnitPage(Page<IdNameNoVo> page, IdNameNoVo idNameNoVo) {
 		return baseMapper.getUnitPage(page, idNameNoVo);

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

@@ -215,6 +215,7 @@
 				and a.STOP_FLAG = #{tSettleDomain.stopFlag}
 			</if>
 		</if>
+		order by CREATE_TIME desc
 	</select>
 
 	<select id="getUnitPage" resultType="com.yifu.cloud.plus.v1.yifu.archives.vo.IdNameNoVo">
@@ -287,8 +288,7 @@
 		a.INVOICE_TITLE_INSURANCE,
 		a.BPO_FLAG
 		FROM t_settle_domain a
-		where 1=1
-			and a.DELETE_FLAG = '0'
+		where a.DELETE_FLAG = '0'
 			<if test="codes != null and codes.size() > 0">
 				and  a.DEPART_NO in
 				<foreach collection="codes" item="param" index="index" open="(" close=")" separator=",">

yifu-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/config/DaprMailProperties.java

+/*
+ * Copyright (c) 2020 yifu4cloud Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.yifu.cloud.plus.v1.yifu.common.dapr.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.stereotype.Component;
+
+/*
+*
+*
+* @author fxj
+* @date  2022-05-23 14:28
+**/
+@Data
+@Component
+@PropertySource("classpath:daprConfig.properties")
+@ConfigurationProperties(value = "dapr.mail", ignoreInvalidFields = false)
+public class DaprMailProperties {
+	String appUrl;
+
+	String appId;
+
+	String appPort;
+
+	String httpPort;
+
+	String grpcPort;
+
+	String metricsPort;
+}

yifu-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/util/MailDaprUtil.java

+package com.yifu.cloud.plus.v1.yifu.common.dapr.util;
+
+import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprCheckProperties;
+import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprMailProperties;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+
+/**
+ * @Author fxj
+ * @Description  邮件发送工具类
+ * @Date 17:53 2022/12/1
+**/
+@Log4j2
+@EnableConfigurationProperties(DaprMailProperties.class)
+public class MailDaprUtil {
+	@Autowired
+	private DaprCheckProperties daprCheckProperties;
+	/**
+	 * @Author fxj
+	 * @Description  身份证&姓名一致性校验
+	 * @Date 21:15 2022/7/18
+	 * @Param
+	 * @return
+	**/
+	/*public R<TCheckIdCard> 	checkIdCardSingle(TCheckIdCard tCheckIdCard){
+		R<TCheckIdCard> res = HttpDaprUtil.invokeMethodPost(daprCheckProperties.getAppUrl(),daprCheckProperties.getAppId(),"/tcheckidcard/inner/checkIdCardSingle",JSON.toJSONString(tCheckIdCard), TCheckIdCard.class, SecurityConstants.FROM_IN);
+		if (Common.isEmpty(res)){
+			return R.failed("校验身份证信息失败！");
+		}
+		return res;
+	}*/
+}

yifu-mail/.gitignore

+# 忽略匹配下列规则的Git 提交 V2.1.0
+### gradle ###
+.gradle
+/build/
+!gradle/wrapper/gradle-wrapper.jar
+
+### STS ###
+.settings/
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+bin/
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+*.lock
+rebel.xml
+
+### NetBeans ###
+nbproject/private/
+build/
+nbbuild/
+nbdist/
+.nb-gradle/
+
+### maven ###
+target/
+*.war
+*.ear
+*.zip
+*.tar
+*.tar.gz
+
+### logs ####
+/logs/
+*.log
+
+### temp ignore ###
+*.cache
+*.diff
+*.patch
+*.tmp
+*.java~
+*.properties~
+*.xml~
+
+### system ignore ###
+.DS_Store
+Thumbs.db
+Servers
+.metadata
+upload
+gen_code
+
+### node ###
+node_modules

yifu-mail/pom.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>com.yifu.cloud.plus.v1</groupId>
+		<artifactId>yifu</artifactId>
+		<version>1.0.0</version>
+	</parent>
+
+	<artifactId>yifu-mail</artifactId>
+    <description>邮件服务</description>
+	<packaging>pom</packaging>
+
+	<!--项目子模块-->
+	<modules>
+		<module>yifu-mail-api</module>
+		<module>yifu-mail-biz</module>
+	</modules>
+
+</project>

yifu-mail/yifu-mail-api/pom.xml

+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+            http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>com.yifu.cloud.plus.v1</groupId>
+		<artifactId>yifu</artifactId>
+		<version>1.0.0</version>
+	</parent>
+
+	<artifactId>yifu-mail-api</artifactId>
+	<packaging>jar</packaging>
+
+	<description>身份证+手机号验证模块</description>
+
+	<dependencies>
+		<!-- core 工具类 -->
+		<dependency>
+			<groupId>com.yifu.cloud.plus.v1</groupId>
+			<artifactId>yifu-common-core</artifactId>
+		</dependency>
+		<!--swagger 注解-->
+		<!--<dependency>
+			<groupId>io.swagger.core.v3</groupId>
+			<artifactId>swagger-annotations</artifactId>
+		</dependency>-->
+		<!--feign 注解依赖-->
+		<!--<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-openfeign-core</artifactId>
+			<optional>true</optional>
+		</dependency>-->
+		<!--mybatis 依赖-->
+		<dependency>
+			<groupId>com.yifu.cloud.plus.v1</groupId>
+			<artifactId>yifu-common-mybatis</artifactId>
+		</dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+        </dependency>
+    </dependencies>
+</project>

yifu-mail/yifu-mail-api/src/main/java/com/yifu/cloud/plus/v1/mail/constant/ChecksConstants.java

+package com.yifu.cloud.plus.v1.check.constant;
+
+/**
+ * @Author fxj
+ * @Date 2022/6/21
+ * @Description
+ * @Version 1.0
+ */
+public interface ChecksConstants {
+
+	String NACOS_CHECK_CONFIG_ERROR="nacos中checks.yaml的配置canCheck未开启！";
+
+	String CODE="code";
+
+	String DATA="data";
+
+	String CODE_200000="200000";
+
+	String NO_DATA_RESULT="接口无返回数据";
+
+	String MESSAGE="message";
+	String MESSAGE_INFO = ",msg:";
+
+	String MOBILE="mobile";
+
+	String AREA="area";
+
+	String NUMBER_TYPE ="numberType";
+
+	String CHARGES_STATUS = "chargesStatus";
+
+	String STATUS="status";
+
+	String RESULT="result";
+
+	String REMARK="remark";
+
+	String APP_ID ="appId";
+
+	String APP_KEY="appKey";
+
+	String MOBILES="mobiles";
+
+	String NAME="name";
+
+	String ID_NUM="idNum";
+
+	String CARD_NO="cardNo";
+}

yifu-mail/yifu-mail-api/src/main/java/com/yifu/cloud/plus/v1/mail/entity/Email.java

+package com.yifu.cloud.plus.v1.mail.entity;
+
+import lombok.Data;
+
+/**
+ * @Author fxj
+ * @Date 2022/12/8
+ * @Description
+ * @Version 1.0
+ */
+@Data
+public class Email {
+	private String[] user;
+	private String subject;
+	private String content;
+}

yifu-mail/yifu-mail-api/src/main/java/com/yifu/cloud/plus/v1/mail/utils/HttpUtils.java

+package com.yifu.cloud.plus.v1.check.utils;
+
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpStatus;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.RequestBuilder;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.util.EntityUtils;
+
+import java.nio.charset.Charset;
+import java.util.Map;
+
+/**
+ * @author hgw2
+ * @description 发送
+ * @date 2022/5/7
+ */
+public class HttpUtils {
+     private static final int REQUEST_TIMEOUT = 3 * 1000; // 设置请求超时10秒钟
+
+     private static final int CONNECT_TIMEOUT = 5 * 1000; // 连接超时时间
+
+     private static final int SO_TIMEOUT = 10 * 1000; // 数据传输超时
+
+     private static final String ENCODING = "UTF-8";
+
+     // 务必单例
+     private static CloseableHttpClient client;
+
+     static {
+          RequestConfig requestConfig = RequestConfig.custom()
+                  .setConnectTimeout(CONNECT_TIMEOUT)
+                  .setConnectionRequestTimeout(REQUEST_TIMEOUT)
+                  .setSocketTimeout(SO_TIMEOUT)
+                  .build();
+          client = HttpClients.custom().setDefaultRequestConfig(requestConfig).setMaxConnTotal(50).build();
+     }
+
+     public static String get(String url, Map<String, String> paramsMap) {
+          return send(RequestBuilder.get(url), paramsMap);
+     }
+
+
+     public static String post(String url, Map<String, String> paramsMap) {
+          return send(RequestBuilder.post(url), paramsMap);
+     }
+
+
+     public static String send(RequestBuilder requestBuilder, Map<String, String> paramsMap) {
+          requestBuilder.setCharset(Charset.forName(ENCODING));
+          String responseText = "";
+
+          if (paramsMap != null) {
+               for (Map.Entry<String, String> param : paramsMap.entrySet()) {
+                    requestBuilder.addParameter(param.getKey(), param.getValue());
+               }
+
+               CloseableHttpResponse response = null;
+               try {
+                    response = client.execute(requestBuilder.build());
+                    if (response.getStatusLine().getStatusCode() == HttpStatus.SC_OK) {
+                         HttpEntity entity = response.getEntity();
+                         if (entity != null) {
+                              responseText = EntityUtils.toString(entity, ENCODING);
+                         }
+                    }
+               } catch (Exception e) {
+                    e.printStackTrace();//正式项目中请改为log打印
+               } finally {
+                    try {
+                         response.close();
+                    } catch (Exception e) {
+                         e.printStackTrace();//正式项目中请改为log打印
+                    }
+               }
+
+          }
+          return responseText;
+
+     }
+}

yifu-mail/yifu-mail-api/src/main/java/com/yifu/cloud/plus/v1/mail/utils/MailUtil.java

+package com.yifu.cloud.plus.v1.mail.utils;
+
+/**
+ * @author hgw2
+ * @description 测试身份证
+ * @date 2022/5/7
+ */
+
+public class MailUtil {
+
+
+}

yifu-mail/yifu-mail-api/src/main/resources/META-INF/spring.factories

+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+  com.yifu.cloud.plus.v1.mail.utils.MailUtil
\ No newline at end of file

yifu-mail/yifu-mail-biz/Dockerfile

+FROM moxm/java:1.8-full
+
+RUN mkdir -p /yifu-mail-biz
+
+WORKDIR yifu-mail-biz
+
+ARG JAR_FILE=target/yifu-mail-biz.jar
+
+COPY ${JAR_FILE} app.jar
+
+EXPOSE 5022
+
+ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom"
+
+CMD sleep 60; java -jar app.jar $JAVA_OPTS

yifu-mail/yifu-mail-biz/build-prd.sh

+#!/usr/bin/env bash
+mvn clean package -Pprd -Dmaven.test.skip=true docker:build -DpushImage
\ No newline at end of file

yifu-mail/yifu-mail-biz/build-test.sh

+#!/usr/bin/env bash
+mvn clean package -Ptest -Dmaven.test.skip=true docker:build -DpushImage
\ No newline at end of file

yifu-mail/yifu-mail-biz/build.sh

+#!/usr/bin/env bash
+mvn clean package -Dmaven.test.skip=true docker:build -DpushImage
\ No newline at end of file

yifu-mail/yifu-mail-biz/pom.xml

+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+            http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.yifu.cloud.plus.v1</groupId>
+        <artifactId>yifu</artifactId>
+        <version>1.0.0</version>
+    </parent>
+
+    <artifactId>yifu-mail-biz</artifactId>
+    <packaging>jar</packaging>
+
+    <description>身份证+手机号验证模块</description>
+
+
+    <dependencies>
+		<!--选配: 依赖seata模块-->
+		<dependency>
+			<groupId>com.yifu.cloud.plus.v1</groupId>
+			<artifactId>yifu-common-seata</artifactId>
+		</dependency>
+		<!-- email -->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-mail</artifactId>
+			<version>2.6.7</version>
+		</dependency>
+
+		<!--必备: 依赖api模块-->
+        <dependency>
+            <groupId>com.yifu.cloud.plus.v1</groupId>
+            <artifactId>yifu-mail-api</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <!--必备：安全模块-->
+        <dependency>
+            <groupId>com.yifu.cloud.plus.v1</groupId>
+            <artifactId>yifu-common-security</artifactId>
+        </dependency>
+        <!--必备：日志处理-->
+        <dependency>
+            <groupId>com.yifu.cloud.plus.v1</groupId>
+            <artifactId>yifu-common-log</artifactId>
+        </dependency>
+        <!--必备：swagger-->
+        <dependency>
+            <groupId>com.yifu.cloud.plus.v1</groupId>
+            <artifactId>yifu-common-swagger</artifactId>
+        </dependency>
+        <!--必备：undertow容器-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-undertow</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+				<groupId>com.spotify</groupId>
+				<artifactId>docker-maven-plugin</artifactId>
+				<version>1.1.0</version>
+				<configuration>
+					<serverId>docker-hub</serverId>
+					<!--指定生成的镜像名-->
+					<imageName>${my.hub.host}/${map.group.name}/${project.artifactId}:${project.version}</imageName>
+					<dockerDirectory>${project.basedir}/</dockerDirectory>
+					<!--指定远程 docker api地址-->
+					<!--<dockerHost>http://172.16.66.232:2375</dockerHost>-->
+					<!--  这里是复制 jar 包到 docker 容器指定目录配置-->
+					<resources>
+						<resource>
+							<targetPath>/</targetPath>
+							<!--jar 包所在的路径  此处配置的 即对应 target 目录-->
+							<directory>${project.build.directory}</directory>
+							<!-- 需要包含的 jar包 ，这里对应的是 Dockerfile中添加的文件名　-->
+							<include>${project.build.finalName}.jar</include>
+						</resource>
+					</resources>
+					<forceTags>true</forceTags>
+				</configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

yifu-mail/yifu-mail-biz/src/main/java/com/yifu/cloud/plus/v1/mail/MailApplication.java

+package com.yifu.cloud.plus.v1.mail;
+
+import com.yifu.cloud.plus.v1.yifu.common.security.annotation.EnableYifuResourceServer;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+/**
+* @author pig archetype
+* <p>
+* 项目启动类
+*/
+@EnableYifuResourceServer
+@SpringBootApplication
+public class MailApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(MailApplication.class, args);
+    }
+
+}

yifu-mail/yifu-mail-biz/src/main/java/com/yifu/cloud/plus/v1/mail/controller/MailController.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.mail.controller;
+
+import com.yifu.cloud.plus.v1.mail.service.MailService;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * @Author fxj
+ * @Description 邮件发送服务
+ * @Date 17:39 2022/12/1
+**/
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/mail" )
+@Tag(name = "邮件发送服务")
+public class MailController {
+
+    private final MailService mailService;
+
+    /**
+     * 邮件发送服务
+     * @return
+     */
+    @Operation(summary = "分页查询", description = "分页查询")
+    @GetMapping("/sendMail" )
+    public R getTCheckMobilePage() {
+        return R.ok(mailService.sendMail(null));
+    }
+
+}

yifu-mail/yifu-mail-biz/src/main/java/com/yifu/cloud/plus/v1/mail/service/MailService.java

+package com.yifu.cloud.plus.v1.mail.service;
+
+
+import com.yifu.cloud.plus.v1.mail.entity.Email;
+
+/**
+ * @Author fxj
+ * @Description
+ * @Date 17:38 2022/12/1
+ * @Param
+ * @return
+**/
+public interface MailService {
+
+	Boolean sendMail(Email email);
+
+}

yifu-mail/yifu-mail-biz/src/main/java/com/yifu/cloud/plus/v1/mail/service/impl/MailServiceImpl.java

+package com.yifu.cloud.plus.v1.mail.service.impl;
+
+import com.yifu.cloud.plus.v1.mail.entity.Email;
+import com.yifu.cloud.plus.v1.mail.service.MailService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.mail.SimpleMailMessage;
+import org.springframework.mail.javamail.JavaMailSender;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Author fxj
+ * @Description 邮件发送服务
+ * @Date 17:41 2022/12/1
+**/
+@Service("mailService")
+public class MailServiceImpl  implements MailService {
+	@Autowired
+	private JavaMailSender mailSender;
+
+	@Override
+	public Boolean sendMail(Email email) {
+		SimpleMailMessage mailMessage = new SimpleMailMessage();
+		mailMessage.setFrom("information@wanxin-holdings.com");
+		mailMessage.setTo("fangxinjiang@wanxin-holdings.com");
+		mailMessage.setText("你好 hello world");
+		mailMessage.setSubject("测试Spring邮箱服务");
+		mailSender.send(mailMessage);
+		System.out.println("====完成发送！====");
+		return null;
+	}
+}

yifu-mail/yifu-mail-biz/src/main/resources/application-dev.yml

+# 数据源配置
+spring:
+  mvc:
+    pathmatch:
+      matching-strategy: ant_path_matcher
+  config:
+    activate:
+      on-profile: dev
+  redis:
+    host: 127.0.0.1
+    password: '@yf_2017'
+  mail:
+    host: smtp.exmail.qq.com
+    port: 465
+    username: information@wanxin-holdings.com
+    password: QmdCaQSPmCAQEddd
+    protocol: smtp
+    default-encoding: UTF-8
+    properties:
+      mail.smtp.auth: true
+      mail.smtp.starttls.enable: true
+      mail.smtp.starttls.required: true
+      mail.smtp.socketFactory.port: 465
+      mail.smtp.socketFactory.class: javax.net.ssl.SSLSocketFactory
+      mail.smtp.socketFactory.fallback: false
+  datasource:
+    type: com.zaxxer.hikari.HikariDataSource
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    username: root
+    password: yf_zsk
+    url: jdbc:mysql://192.168.1.65:22306/yifu_mail?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+    hikari:
+      driver-class-name: ${spring.datasource.driver-class-name}
+      jdbc-url: ${spring.datasource.url}
+      username: ${spring.datasource.username}
+      password: ${spring.datasource.password}
+      pool-name: AmytangHikariCP
+      minimum-idle: 10 # 最小空闲连接数量
+      idle-timeout: 60000 # 空闲连接存活最大时间，默认600000（10分钟）
+      maximum-pool-size: 12 # 连接池最大连接数，默认是10
+      auto-commit: true  #此属性控制从池返回的连接的默认自动提交行为,默认值：true
+      max-lifetime: 0 #此属性控制池中连接的最长生命周期，值0表示无限生命周期，默认1800000即30分钟
+## spring security 配置
+security:
+  oauth2:
+    resource:
+      loadBalanced: true
+      token-info-uri: http://127.0.0.1:3000/oauth/check_token
+    # 直接放行URL
+    ignore:
+      urls:
+        - /v3/api-docs
+        - /actuator/**
+        - /swagger-ui/**
+        - /sendMail/**
\ No newline at end of file

yifu-mail/yifu-mail-biz/src/main/resources/application-test.yml

+# 数据源配置
+spring:
+  mvc:
+    pathmatch:
+      matching-strategy: ant_path_matcher
+  config:
+    activate:
+      on-profile: test
+  redis:
+    host: 192.168.1.65
+    port: 22379
+    password: '@yf_2017'
+  datasource:
+    type: com.zaxxer.hikari.HikariDataSource
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    username: root
+    password: yf_zsk
+    url: jdbc:mysql://192.168.1.65:22306/yifu_job?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+    hikari:
+      driver-class-name: ${spring.datasource.driver-class-name}
+      jdbc-url: ${spring.datasource.url}
+      username: ${spring.datasource.username}
+      password: ${spring.datasource.password}
+      pool-name: AmytangHikariCP
+      minimum-idle: 10 # 最小空闲连接数量
+      idle-timeout: 60000 # 空闲连接存活最大时间，默认600000（10分钟）
+      maximum-pool-size: 12 # 连接池最大连接数，默认是10
+      auto-commit: true  #此属性控制从池返回的连接的默认自动提交行为,默认值：true
+      max-lifetime: 0 #此属性控制池中连接的最长生命周期，值0表示无限生命周期，默认1800000即30分钟
+## spring security 配置
+security:
+  oauth2:
+    resource:
+      loadBalanced: true
+      token-info-uri: http://127.0.0.1:3000/oauth/check_token
+    # 直接放行URL
+    ignore:
+      urls:
+        - /v3/api-docs
+        - /actuator/**
+        - /swagger-ui/**
\ No newline at end of file

yifu-mail/yifu-mail-biz/src/main/resources/application.yml

+server:
+  port: 5024
+# 加解密根密码
+jasypt:
+  encryptor:
+    password: yifu #根密码
+# 暴露监控端点
+management:
+  endpoints:
+    web:
+      exposure:
+        include: "*"
+  endpoint:
+    health:
+      show-details: ALWAYS
+
+# mybaits-plus配置
+mybatis-plus:
+  mapper-locations: classpath:/mapper/*Mapper.xml
+  global-config:
+    banner: false
+    db-config:
+      id-type: auto
+      table-underline: true
+      logic-delete-value: 1
+      logic-not-delete-value: 0
+  configuration:
+    map-underscore-to-camel-case: true
+
+spring:
+  application:
+    name: @artifactId@
+#swagger 文档 https://springdoc.org/
+### OpenAPI3 注解
+#  OpenAPI 3	                            注解位置
+#  @Tag(name = “接口类描述”)	                Controller 类上
+#  @Operation(summary =“接口方法描述”)	    Controller 方法上
+#  @Parameters	                            Controller 方法上
+#  @Parameter(description=“参数描述”)	    Controller 方法上 @Parameters 里
+#  @Parameter(description=“参数描述”)	    Controller 方法的参数上
+#  @Parameter(hidden = true) 或 @Hidden	--
+#  @Schema	                                DTO类上
+#  @Schema	                                DTO属性上
+
+springdoc:
+  api-docs:
+    #是否开启文档功能
+    enabled: true
+    #swagger后端请求地址
+    path: /api-docs
+  swagger-ui:
+    #自定义swagger前端请求路径，输入http：127.0.0.1:8080/test会自动重定向到swagger页面
+    path: /api
+  #包扫描路径
+  packages-to-scan: com.yifu.cloud.plus.v1.mail.controller
+  #这里定义了两个分组，可定义多个，也可以不定义
+  group-configs:
+    #分组名
+    #- group: admin
+    #按路径匹配
+    #  pathsToMatch: /admin/**
+    #分组名
+    - group: mail
+      #按包路径匹配
+      packagesToScan: com.yifu.cloud.plus.v1.mail.controller
\ No newline at end of file

yifu-mail/yifu-mail-biz/src/main/resources/logback-spring.xml

+<?xml version="1.0" encoding="UTF-8"?>
+
+<configuration debug="false" scan="false">
+  <springProperty scop="context" name="spring.application.name" source="spring.application.name" defaultValue=""/>
+  <property name="log.path" value="logs/${spring.application.name}"/>
+  <!-- 彩色日志格式 -->
+  <property name="CONSOLE_LOG_PATTERN"
+            value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+  <!-- 彩色日志依赖的渲染类 -->
+  <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
+  <conversionRule conversionWord="wex"
+                  converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
+  <conversionRule conversionWord="wEx"
+                  converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
+  <!-- Console log output -->
+  <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <pattern>${CONSOLE_LOG_PATTERN}</pattern>
+    </encoder>
+  </appender>
+
+  <!-- Log file debug output -->
+  <appender name="debug" class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>${log.path}/debug.log</file>
+    <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+      <fileNamePattern>${log.path}/%d{yyyy-MM, aux}/debug.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
+      <maxFileSize>50MB</maxFileSize>
+      <maxHistory>30</maxHistory>
+    </rollingPolicy>
+    <encoder>
+      <pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <!-- Log file error output -->
+  <appender name="error" class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>${log.path}/error.log</file>
+    <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+      <fileNamePattern>${log.path}/%d{yyyy-MM}/error.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
+      <maxFileSize>50MB</maxFileSize>
+      <maxHistory>30</maxHistory>
+    </rollingPolicy>
+    <encoder>
+      <pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
+    </encoder>
+    <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+      <level>ERROR</level>
+    </filter>
+  </appender>
+
+  <!-- Level: FATAL 0  ERROR 3  WARN 4  INFO 6  DEBUG 7 -->
+  <root level="INFO">
+    <appender-ref ref="console"/>
+    <appender-ref ref="debug"/>
+    <appender-ref ref="error"/>
+  </root>
+</configuration>
+

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

@@ -19,6 +19,7 @@ package com.yifu.cloud.plus.v1.yifu.social.entity;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.HeadFontStyle;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
@@ -130,4 +131,52 @@ public class SysHouseHoldInfo extends BaseEntity {
 	@ExcelProperty("所属机构名称")
     private String organName;
 
+	/**
+     * 审核人id
+     */
+    @ExcelAttribute(name = "审核人id" )
+    @Schema(description ="审核人id")
+    @HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("审核人id")
+    private String auditUser;
+
+	/**
+     * 办理人id
+     */
+    @ExcelAttribute(name = "办理人id" )
+    @Schema(description ="办理人id")
+    @HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("办理人id")
+    private String handleUser;
+
+	/**
+     * 审核人
+     */
+    @ExcelAttribute(name = "审核人" )
+    @Schema(description ="审核人")
+    @HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("审核人")
+    private String auditUserName;
+
+	/**
+     * 办理人
+     */
+    @ExcelAttribute(name = "办理人" )
+    @Schema(description ="办理人")
+    @HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("办理人")
+    private String handleUserName;
+
+	/**
+	 * 审核人部门
+	 */
+	@TableField(exist = false)
+	private String auditUserDeptName;
+
+	/**
+	 * 办理人部门
+	 */
+	@TableField(exist = false)
+	private String handleUserDeptName;
+
 }

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TSocialfundHouseResMapper.java

@@ -47,4 +47,13 @@ public interface TSocialfundHouseResMapper extends BaseMapper<TSocialfundHouseRe
 	 * @return
 	 */
 	List<TSocialfundHouseRes> getexportList(@Param("tSocialfundHouseRes") TSocialfundHouseRes tSocialfundHouseRes);
+
+	/**
+	 * @Description: 删权限
+	 * @Author: hgw
+	 * @Date: 2022/12/6 16:44
+	 * @return: void
+	 **/
+	void deleteByUserIdAndHuName(@Param("tSocialfundHouseRes") TSocialfundHouseRes tSocialfundHouseRes);
+
 }

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

@@ -18,6 +18,7 @@
 package com.yifu.cloud.plus.v1.yifu.social.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yifu.cloud.plus.v1.yifu.social.entity.SysHouseHoldInfo;
 import com.yifu.cloud.plus.v1.yifu.social.entity.TSocialfundHouseRes;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -45,4 +46,21 @@ public interface TSocialfundHouseResService extends IService<TSocialfundHouseRes
     List<TSocialfundHouseRes> getexportList(TSocialfundHouseRes searchVo);
 
 	R saveSocialAuth(TSocialfundHouseRes searchVo);
+
+	/**
+	 * @Description: 删除审核人权限
+	 * @Author: hgw
+	 * @Date: 2022/12/6 15:57
+	 * @return: void
+	 **/
+	void deleteAuditUser(SysHouseHoldInfo holdInfo);
+
+	/**
+	 * @Description: 删除办理人权限
+	 * @Author: hgw
+	 * @Date: 2022/12/6 15:57
+	 * @return: void
+	 **/
+	void deleteHandleUser(SysHouseHoldInfo holdInfo);
+
 }

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

@@ -26,10 +26,13 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 import com.yifu.cloud.plus.v1.yifu.social.entity.SysBaseSetInfo;
 import com.yifu.cloud.plus.v1.yifu.social.entity.SysHouseHoldInfo;
+import com.yifu.cloud.plus.v1.yifu.social.entity.TSocialfundHouseRes;
 import com.yifu.cloud.plus.v1.yifu.social.mapper.SysBaseSetInfoMapper;
 import com.yifu.cloud.plus.v1.yifu.social.mapper.SysHouseHoldInfoMapper;
 import com.yifu.cloud.plus.v1.yifu.social.service.SysHouseHoldInfoService;
+import com.yifu.cloud.plus.v1.yifu.social.service.TSocialfundHouseResService;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -43,6 +46,10 @@ import org.springframework.stereotype.Service;
 public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMapper, SysHouseHoldInfo> implements SysHouseHoldInfoService {
 
 	private final SysBaseSetInfoMapper baseSetInfoMapper;
+
+	@Autowired
+	private TSocialfundHouseResService tSocialfundHouseResService;
+
     /**
      * 社保户公积金户数据简单分页查询
      * @param sysHouseHoldInfo 社保户公积金户数据
@@ -68,9 +75,45 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
 		if (null != info){
 			return R.failed("对应账户性质、户名的配置已存在！");
 		}
+		if (Common.isEmpty(sysHouseHoldInfo.getAuditUser()) || Common.isEmpty(sysHouseHoldInfo.getHandleUser())) {
+			return R.failed("审核人或办理人必填！");
+		}
 		baseMapper.insert(sysHouseHoldInfo);
+
+		// 同步审核权限、办理权限
+		this.saveAuditUserOrHandleUser(sysHouseHoldInfo, CommonConstants.ZERO_STRING);
+		this.saveAuditUserOrHandleUser(sysHouseHoldInfo, CommonConstants.ONE_STRING);
 		return R.ok();
 	}
+
+	/**
+	 * @param authType 0 审核人 1办理人
+	 * @Description: 添加审核人、办理人
+	 * @Author: hgw
+	 * @Date: 2022/12/6 15:50
+	 * @return: void
+	 **/
+	private void saveAuditUserOrHandleUser(SysHouseHoldInfo sysHouseHoldInfo, String authType) {
+		TSocialfundHouseRes searchVo = new TSocialfundHouseRes();
+		searchVo.setAuthType(authType);
+		searchVo.setHouseNameType(sysHouseHoldInfo.getType());
+		if (CommonConstants.ZERO_STRING.equals(sysHouseHoldInfo.getType())) {
+			searchVo.setSocialHousehold(sysHouseHoldInfo.getName());
+		} else {
+			searchVo.setFundHousehold(sysHouseHoldInfo.getName());
+		}
+		if (CommonConstants.ZERO_STRING.equals(authType)) {
+			searchVo.setUserId(sysHouseHoldInfo.getAuditUser());
+			searchVo.setUserName(sysHouseHoldInfo.getAuditUserName());
+			searchVo.setUserDeptName(sysHouseHoldInfo.getAuditUserDeptName());
+		} else {
+			searchVo.setUserId(sysHouseHoldInfo.getHandleUser());
+			searchVo.setUserName(sysHouseHoldInfo.getHandleUserName());
+			searchVo.setUserDeptName(sysHouseHoldInfo.getHandleUserDeptName());
+		}
+		tSocialfundHouseResService.saveSocialAuth(searchVo);
+	}
+
 	/**
 	 * @Author fxj
 	 * @Description 修改社保户公积金户数据
@@ -85,6 +128,14 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
 		if (Common.isEmpty(holdInfo)){
 			return R.failed(CommonConstants.NO_DATA_TO_HANDLE);
 		}
+		// 编辑标志 true：编辑；false：启用禁用（说明不需要拦截其他必填项）
+		boolean isEdit = true;
+		if (Common.isEmpty(hold.getType()) && Common.isNotNull(hold.getDelFlag())) {
+			isEdit = false;
+		}
+		if (isEdit && (Common.isEmpty(hold.getAuditUser()) || Common.isEmpty(hold.getHandleUser()))) {
+			return R.failed("审核人或办理人必填！");
+		}
 		if (CommonConstants.ONE_STRING.equals(hold.getDelFlag())
 				&& baseSetInfoMapper.selectCount(Wrappers.<SysBaseSetInfo>query().lambda()
 				.eq(SysBaseSetInfo::getBaseType, holdInfo.getType())
@@ -98,6 +149,18 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
 		}
 		int res = baseMapper.updateById(hold);
 		if (res >= 0){
+			if (isEdit) {
+				// 新老数据审核人办理人不同，先删除，再添加
+				if (Common.isNotNull(holdInfo.getAuditUser()) && !holdInfo.getAuditUser().equals(hold.getAuditUser())) {
+					tSocialfundHouseResService.deleteAuditUser(holdInfo);
+				}
+				if (Common.isNotNull(holdInfo.getHandleUser()) && !holdInfo.getHandleUser().equals(hold.getHandleUser())) {
+					tSocialfundHouseResService.deleteHandleUser(holdInfo);
+				}
+				// 同步审核权限、办理权限
+				this.saveAuditUserOrHandleUser(hold, CommonConstants.ZERO_STRING);
+				this.saveAuditUserOrHandleUser(hold, CommonConstants.ONE_STRING);
+			}
 			return  R.ok();
 		}else {
 			return R.failed(CommonConstants.SAVE_FAILED);

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

@@ -517,6 +517,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 						|| Common.isNotNull(excel.getUnemploymentCardinal()) || Common.isNotNull(excel.getWorkInjuryCardinal())) {
 					errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.SOCIAL_HOLD_IS_EMPTY)));
 					excelVOTemp.put(excel.getRowIndex().toString(),excel.getEmpIdcard());
+					continue;
 				}
 			}
 			if (Common.isNotNull(excel.getProvidentHousehold())){
@@ -530,6 +531,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 					Common.isNotNull(excel.getProvidentPer())) {
 					errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.FUND_HOLD_IS_EMPTY)));
 					excelVOTemp.put(excel.getRowIndex().toString(),excel.getEmpIdcard());
+					continue;
 				}
 			}
 			if (Common.isNotNull(dispatchMap) && Common.isNotNull(dispatchMap.get(excel.getEmpIdcard()))){
@@ -911,10 +913,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 				socialFund.setRecordBase(social.getRecordBase());
 				socialFund.setTrustRemark(social.getTrustRemark());
 				socialFund.setPaymentType(social.getPaymentType());
-
-
-
-
 				socialFund.setUnitSocialSum(BigDecimalUtils.safeAdd(socialFund.getUnitPersionMoney()
 						, socialFund.getUnitMedicalMoney(), socialFund.getUnitBirthMoney()
 						, socialFund.getUnitInjuryMoney()
@@ -1067,6 +1065,18 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 					socialFund.setUpperLimit(socialSet.getUpperLimit());
 					socialFund.setPayPolicy(socialSet.getPayPolicy());
 					socialFund.setLatestCardinality(socialSet.getInsuranceIsLatestCardinality());
+					//配置没有大病清理社保公积金查询里面残留的历史大病信息
+					if (CommonConstants.ONE_STRING.equals(socialSet.getIsIllness())
+							&& Common.isNotNull(socialFund.getBigailmentHandle())){
+						socialFund.setBigailmentHandle(null);
+						socialFund.setBigailmentStart(null);
+						socialFund.setUnitBigailmentCardinal(null);
+						socialFund.setUnitBigailmentPer(null);
+						socialFund.setPersonalBigailmentCardinal(null);
+						socialFund.setPersonalBigailmentPer(null);
+						socialFund.setPersonalBigailmentMoney(null);
+						socialFund.setUnitBigailmentMoney(null);
+					}
 				}
 			}
 			if (Common.isNotNull(excel.getProvidentHousehold())){
@@ -1924,6 +1934,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		contract.setCustomerId(setInfoVo.getCustomerId());
 		contract.setSubjectUnit(setInfoVo.getCustomerName());
 		contract.setSubjectDepart(setInfoVo.getDepartName());
+		contract.setEmpNatrue(excel.getEmpType());
 		if (Common.isNotNull(empVo)) {
 			contract.setEmpId(empVo.getId());
 			contract.setEmpNo(empVo.getEmpNo());

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

@@ -40,6 +40,7 @@ import com.yifu.cloud.plus.v1.yifu.social.entity.TIncomeDetail;
 import com.yifu.cloud.plus.v1.yifu.social.entity.TPaymentInfo;
 import com.yifu.cloud.plus.v1.yifu.social.entity.TSendEkpError;
 import com.yifu.cloud.plus.v1.yifu.social.mapper.TIncomeMapper;
+import com.yifu.cloud.plus.v1.yifu.social.mapper.TPaymentInfoMapper;
 import com.yifu.cloud.plus.v1.yifu.social.service.TIncomeDetailService;
 import com.yifu.cloud.plus.v1.yifu.social.service.TIncomeService;
 import com.yifu.cloud.plus.v1.yifu.social.service.TSendEkpErrorService;
@@ -84,6 +85,9 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
 	@Autowired
 	private DoJointSocialTask doJointSocialTask;
 
+	@Autowired
+	private TPaymentInfoMapper tPaymentInfoMapper;
+
 	/**
 	 * 收入明细表简单分页查询
 	 *
@@ -668,19 +672,11 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
 					if (CommonConstants.ZERO_STRING.equals(tIncomeDetail.getRedData())) {
 						if (insureMap.get(tIncomeDetail.getDataCreateMonth() + CommonConstants.DOWN_LINE_STRING + tIncomeDetail.getFeeType()) == null
 								|| insureMap.get(tIncomeDetail.getDataCreateMonth() + CommonConstants.DOWN_LINE_STRING + tIncomeDetail.getFeeType()) <= CommonConstants.ZERO_INT) {
-							if (Common.isNotNull(paymentInfo)) {
-								return this.savePaymentIncome(tIncomeDetail,paymentInfo);
-							} else {
-								return this.saveIncome(tIncomeDetail,synFlag);
-							}
+							return this.saveIncome(tIncomeDetail,synFlag);
 						}
 					} else {
 						if (this.redDateJudge(tIncomeDetail, numMap)) {
-							if (Common.isNotNull(paymentInfo)) {
-								return this.savePaymentIncome(tIncomeDetail,paymentInfo);
-							} else {
-								return this.saveIncome(tIncomeDetail,synFlag);
-							}
+							return this.saveIncome(tIncomeDetail,synFlag);
 						}
 					}
 				} else {
@@ -692,11 +688,7 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
 				if (CommonConstants.TWO_STRING.equals(tIncomeDetail.getFeeMode())) {
 					if (incomeMap.get(tIncomeDetail.getPayMonth() + CommonConstants.DOWN_LINE_STRING + tIncomeDetail.getFeeType()) == null
 							|| incomeMap.get(tIncomeDetail.getPayMonth() + CommonConstants.DOWN_LINE_STRING + tIncomeDetail.getFeeType()) <= CommonConstants.ZERO_INT) {
-						if (Common.isNotNull(paymentInfo)) {
-							return this.savePaymentIncome(tIncomeDetail,paymentInfo);
-						} else {
-							return this.saveIncome(tIncomeDetail,synFlag);
-						}
+						return this.saveIncome(tIncomeDetail,synFlag);
 					}
 				} else {
 					// 3金额-人次
@@ -705,6 +697,9 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
 				}
 			}
 		}
+		if (Common.isNotNull(paymentInfo)) {
+			tPaymentInfoMapper.updateBySocialIncomeFlag(paymentInfo.getId());
+		}
 		return true;
 	}
 

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

@@ -45,8 +45,6 @@ import com.yifu.cloud.plus.v1.yifu.common.dapr.util.ArchivesDaprUtil;
 import com.yifu.cloud.plus.v1.yifu.common.dapr.util.InsuranceDaprUtil;
 import com.yifu.cloud.plus.v1.yifu.common.dapr.util.UpmsDaprUtils;
 import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
-import com.yifu.cloud.plus.v1.yifu.ekp.util.EkpFundUtil;
-import com.yifu.cloud.plus.v1.yifu.ekp.util.EkpSocialUtil;
 import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpPushFundParam;
 import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpPushSocialParam;
 import com.yifu.cloud.plus.v1.yifu.salary.vo.TPaymentBySalaryVo;
@@ -60,7 +58,6 @@ import com.yifu.cloud.plus.v1.yifu.social.mapper.*;
 import com.yifu.cloud.plus.v1.yifu.social.service.TEkpChangeDeptLogService;
 import com.yifu.cloud.plus.v1.yifu.social.service.TIncomeService;
 import com.yifu.cloud.plus.v1.yifu.social.service.TPaymentInfoService;
-import com.yifu.cloud.plus.v1.yifu.social.service.TSendEkpErrorService;
 import com.yifu.cloud.plus.v1.yifu.social.util.DoJointSocialTask;
 import com.yifu.cloud.plus.v1.yifu.social.vo.*;
 import lombok.extern.log4j.Log4j2;
@@ -113,12 +110,6 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 	@Autowired
 	private SysHouseHoldInfoMapper sysHouseHoldInfoMapper;
 
-	@Autowired
-	private EkpFundUtil ekpFundUtil;
-
-	@Autowired
-	private EkpSocialUtil ekpSocialUtil;
-
 	@Autowired
 	private TIncomeDetailMapper detailMapper;
 
@@ -128,9 +119,6 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 	@Autowired
 	private ArchivesDaprUtil archivesDaprUtil;
 
-	@Autowired
-	private TSendEkpErrorService tSendEkpErrorService;
-
 	@Autowired
 	private TForecastLibraryMapper tForecastLibraryMapper;
 
@@ -3192,6 +3180,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 					}
 				}
 				if (exitFlag) {
+					baseMapper.updateBySocialIncomeFlag(paymentInfo.getId());
 					continue;
 				}
 				if (sumMoney.compareTo(BigDecimal.ZERO) > 0) {

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

@@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
+import com.yifu.cloud.plus.v1.yifu.social.entity.SysHouseHoldInfo;
 import com.yifu.cloud.plus.v1.yifu.social.entity.TSocialfundHouseRes;
 import com.yifu.cloud.plus.v1.yifu.social.mapper.TSocialfundHouseResMapper;
 import com.yifu.cloud.plus.v1.yifu.social.service.TSocialfundHouseResService;
@@ -93,4 +94,39 @@ public class TSocialfundHouseResServiceImpl extends ServiceImpl<TSocialfundHouse
 			return R.ok();
 		}
 	}
+
+	@Override
+	public void deleteAuditUser(SysHouseHoldInfo holdInfo) {
+		if (Common.isNotNull(holdInfo.getType()) && Common.isNotNull(holdInfo.getName())
+				&& Common.isNotNull(holdInfo.getAuditUser())) {
+			// 审核权限
+			TSocialfundHouseRes searchVo = new TSocialfundHouseRes();
+			if (CommonConstants.ZERO_STRING.equals(holdInfo.getType())) {
+				searchVo.setSocialHousehold(holdInfo.getName());
+			} else {
+				searchVo.setFundHousehold(holdInfo.getName());
+			}
+			searchVo.setUserId(holdInfo.getAuditUser());
+			searchVo.setAuthType(CommonConstants.ZERO_STRING);
+			baseMapper.deleteByUserIdAndHuName(searchVo);
+		}
+	}
+
+	@Override
+	public void deleteHandleUser(SysHouseHoldInfo holdInfo) {
+		if (Common.isNotNull(holdInfo.getType()) && Common.isNotNull(holdInfo.getName())
+				&& Common.isNotNull(holdInfo.getHandleUser())) {
+			// 办理权限
+			TSocialfundHouseRes searchVo = new TSocialfundHouseRes();
+			if (CommonConstants.ZERO_STRING.equals(holdInfo.getType())) {
+				searchVo.setSocialHousehold(holdInfo.getName());
+			} else {
+				searchVo.setFundHousehold(holdInfo.getName());
+			}
+			searchVo.setUserId(holdInfo.getHandleUser());
+			searchVo.setAuthType(CommonConstants.ONE_STRING);
+			baseMapper.deleteByUserIdAndHuName(searchVo);
+		}
+	}
+
 }

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

@@ -35,6 +35,10 @@
     <result property="town" column="TOWN"/>
     <result property="rmark" column="RMARK"/>
     <result property="organName" column="ORGAN_NAME"/>
+	<result property="auditUser" column="AUDIT_USER"/>
+	<result property="auditUserName" column="AUDIT_USER_NAME"/>
+	<result property="handleUser" column="HANDLE_USER"/>
+	<result property="handleUserName" column="HANDLE_USER_NAME"/>
     <result property="createBy" column="CREATE_BY"/>
     <result property="updateBy" column="UPDATE_BY"/>
     <result property="createName" column="CREATE_NAME"/>
@@ -56,7 +60,11 @@
                 a.CREATE_BY,
                 a.UPDATE_BY,
                 a.CREATE_NAME,
-                a.UPDATE_TIME
+                a.UPDATE_TIME,
+				a.AUDIT_USER,
+				a.AUDIT_USER_NAME,
+				a.HANDLE_USER,
+				a.HANDLE_USER_NAME
     </sql>
     <sql id="sysHouseHoldInfo_where">
         <if test="sysHouseHoldInfo != null">

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

@@ -111,4 +111,19 @@
 			<include refid="tSocialfundHouseRes_where"/>
 		</where>
 	</select>
+
+	<!-- 删权限 -->
+	<delete id="deleteByUserIdAndHuName">
+		delete from t_socialfund_house_res where USER_ID = #{tSocialfundHouseRes.userId} and AUTH_TYPE = #{tSocialfundHouseRes.authType}
+		<if test="tSocialfundHouseRes.socialHousehold != null and tSocialfundHouseRes.socialHousehold.trim() != ''">
+			AND SOCIAL_HOUSEHOLD = #{tSocialfundHouseRes.socialHousehold}
+		</if>
+		<if test="tSocialfundHouseRes.fundHousehold != null and tSocialfundHouseRes.fundHousehold.trim() != ''">
+			AND FUND_HOUSEHOLD = #{tSocialfundHouseRes.fundHousehold}
+		</if>
+		<if test="tSocialfundHouseRes.socialHousehold == null and tSocialfundHouseRes.fundHousehold == null">
+			AND 1=2
+		</if>
+	</delete>
+
 </mapper>

yifu-upms/yifu-upms-api/src/main/java/com/yifu.cloud.plus.v1/yifu/admin/api/vo/UserPasswordVo.java

+/*
+ * Copyright (c) 2020 yifu4cloud Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.yifu.cloud.plus.v1.yifu.admin.api.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * @author hgw
+ * @date 2022-12-7 10:46:38
+ */
+@Data
+public class UserPasswordVo {
+
+	@Schema(description = "用户id")
+	private String userId;
+
+	@Schema(description = "用户登录名")
+	private String userName;
+
+	@Schema(description = "原密码")
+	private String oldPassword;
+
+	@Schema(description = "新密码")
+	private String newPassword;
+
+}

yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/controller/UserController.java

@@ -173,6 +173,17 @@ public class UserController {
 		return R.ok(userService.updateUser(userDto));
 	}
 
+	/**
+	 * 修改密码
+	 * @param vo 用户信息
+	 * @return R
+	 */
+	@SysLog("修改密码")
+	@PostMapping("/updatePassword")
+	public R<String> updatePassword(@RequestBody UserPasswordVo vo) {
+		return userService.updatePassword(vo);
+	}
+
 	/**
 	 * 分页查询用户
 	 * @param page 参数集

yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/service/SysUserService.java

@@ -23,6 +23,7 @@ import com.yifu.cloud.plus.v1.yifu.admin.api.dto.UserDTO;
 import com.yifu.cloud.plus.v1.yifu.admin.api.dto.UserInfo;
 import com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysUser;
 import com.yifu.cloud.plus.v1.yifu.admin.api.vo.UserExcelVO;
+import com.yifu.cloud.plus.v1.yifu.admin.api.vo.UserPasswordVo;
 import com.yifu.cloud.plus.v1.yifu.admin.api.vo.UserVO;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 import org.springframework.validation.BindingResult;
@@ -73,6 +74,15 @@ public interface SysUserService extends IService<SysUser> {
 	 */
 	Boolean updateUser(UserDTO userDto);
 
+	/**
+	 * @param vo
+	 * @Description: 修改密码
+	 * @Author: hgw
+	 * @Date: 2022/12/7 10:48
+	 * @return: java.lang.Boolean
+	 **/
+	R<String> updatePassword(UserPasswordVo vo);
+
 	/**
 	 * 通过ID查询用户信息
 	 * @param id 用户ID

yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/service/impl/SysUserServiceImpl.java

@@ -31,6 +31,7 @@ import com.yifu.cloud.plus.v1.yifu.admin.api.dto.UserInfo;
 import com.yifu.cloud.plus.v1.yifu.admin.api.entity.*;
 import com.yifu.cloud.plus.v1.yifu.admin.api.util.ParamResolver;
 import com.yifu.cloud.plus.v1.yifu.admin.api.vo.UserExcelVO;
+import com.yifu.cloud.plus.v1.yifu.admin.api.vo.UserPasswordVo;
 import com.yifu.cloud.plus.v1.yifu.admin.api.vo.UserVO;
 import com.yifu.cloud.plus.v1.yifu.admin.mapper.*;
 import com.yifu.cloud.plus.v1.yifu.admin.service.SysMenuService;
@@ -242,6 +243,20 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 		return Boolean.TRUE;
 	}
 
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	@CacheEvict(value = CacheConstants.USER_DETAILS, key = "#vo.userName")
+	public R<String> updatePassword(UserPasswordVo vo) {
+		SysUser sysUser = this.getOne(Wrappers.<SysUser>query().lambda().eq(SysUser::getUserId, vo.getUserId()));
+		if (ENCODER.matches(vo.getOldPassword(), sysUser.getPassword())) {
+			sysUser.setPassword(ENCODER.encode(vo.getNewPassword()));
+		} else {
+			return R.failed("原密码错误");
+		}
+		this.updateById(sysUser);
+		return R.ok();
+	}
+
 	/**
 	 * 查询上级部门的用户信息
 	 * @param username 用户名