Merge branch 'develop' into feature-zhaji

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/TSalaryStandardController.java

@@ -58,6 +58,21 @@ public class TSalaryStandardController {
 
 	private final TApprovalRecordService auditLogService;
 
+
+	/**
+	 * 简单分页查询-申请
+	 *
+	 * @param page            分页对象
+	 * @param tSalaryStandard 标准薪酬工资表
+	 * @return
+	 */
+	@Operation(description = "简单分页查询")
+	@GetMapping("/pageApply")
+	public R<IPage<TSalaryStandard>> getTSalaryStandardPageApply(Page<TSalaryStandard> page, TSalaryStandardSearchVo tSalaryStandard) {
+		tSalaryStandard.setDeleteFlag(CommonConstants.ZERO_INT);
+		return new R<>(tSalaryStandardService.getTSalaryStandardPageApply(page, tSalaryStandard));
+	}
+
 	/**
 	 * 简单分页查询
 	 *

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/mapper/TSalaryStandardMapper.java

@@ -43,6 +43,7 @@ public interface TSalaryStandardMapper extends BaseMapper<TSalaryStandard> {
      */
     IPage<TSalaryStandard> getTSalaryStandardPage(Page<TSalaryStandard> page, @Param("tSalaryStandard") TSalaryStandard tSalaryStandard);
 
+	IPage<TSalaryStandard> getTSalaryStandardPageApply(Page<TSalaryStandard> page, @Param("tSalaryStandard") TSalaryStandard tSalaryStandard);
 	/**
 	 * 标准薪酬工资表审核页面简单分页查询
 	 * @param tSalaryStandard 标准薪酬工资表
@@ -53,4 +54,5 @@ public interface TSalaryStandardMapper extends BaseMapper<TSalaryStandard> {
 	List<TSalaryStandardExportVo> getSalaryStandardExport(@Param("searchVo") TSalaryStandardSearchVo searchVo, @Param("idList")List<String> idList);
 
 	int getSalaryStandardExportCount(@Param("searchVo") TSalaryStandardSearchVo searchVo, @Param("idList")List<String> idList);
+
 }

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/TSalaryStandardService.java

@@ -74,4 +74,5 @@ public interface TSalaryStandardService extends IService<TSalaryStandard> {
 	 **/
 	R<String> deleteSalaryById(String id);
 
+	IPage<TSalaryStandard> getTSalaryStandardPageApply(Page<TSalaryStandard> page, TSalaryStandardSearchVo tSalaryStandard);
 }

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryStandardServiceImpl.java

@@ -84,6 +84,17 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
 
 	@Autowired
 	private DaprSocialProperties socialProperties;
+
+	/**
+	 * 标准薪酬工资表简单分页查询
+	 *
+	 * @param tSalaryStandard 标准薪酬工资表
+	 * @return
+	 */
+	@Override
+	public IPage<TSalaryStandard> getTSalaryStandardPageApply(Page<TSalaryStandard> page, TSalaryStandardSearchVo tSalaryStandard) {
+		return baseMapper.getTSalaryStandardPageApply(page, tSalaryStandard);
+	}
 	/**
 	 * 标准薪酬工资表简单分页查询
 	 *

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSpecialDeducationSumServiceImpl.java

@@ -19,6 +19,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @Author fxj
@@ -128,7 +129,10 @@ public class TSpecialDeducationSumServiceImpl extends ServiceImpl<TSpecialDeduca
                if (Common.isEmpty(declareTitle)) {
                     return R.failed("申报单位不能为空");
                }
-
+			   List<String>  uc = sdsList.stream().map(TSpecialDeducationSum::getDeclareTitle).collect(Collectors.toList());
+			   if (Common.isNotNull(uc) && uc.size() > CommonConstants.ONE_INT){
+				   return R.failed("一次只允许导入一个申报单位");
+			   }
                TSpecialDeducationSum sdsCheck = new TSpecialDeducationSum();
                sdsCheck.setCreateMonth(yearMonth);
                sdsCheck.setDeclareTitle(declareTitle);

yifu-salary/yifu-salary-biz/src/main/resources/mapper/SysMessageSalaryMapper.xml

@@ -20,6 +20,8 @@
         <result property="type" column="TYPE"/>
         <result property="customerId" column="CUSTOMER_ID"/>
         <result property="customerName" column="CUSTOMER_NAME"/>
+		<result property="reasonType" column="REASON_TYPE"/>
+		<result property="feedBack" column="FEED_BACK"/>
     </resultMap>
 	<resultMap id="sysMessageSalaryExportMap" type="com.yifu.cloud.plus.v1.yifu.salary.vo.SysMessageSalaryExportVo">
 		<result property="actualSalary" column="actual_salary"/>
@@ -119,8 +121,7 @@
     <!--sysMessageSalary简单分页查询-->
     <select id="getSysMessageSalaryPage" resultMap="sysMessageSalaryMap">
         SELECT
-        <include refid="Base_Column_List"/>,
-        b.*
+        <include refid="Base_Column_List"/>
         FROM sys_message_salary a
         left join t_feed_back b  on  a.ID=b.RELATE_ID
         <where>

yifu-salary/yifu-salary-biz/src/main/resources/mapper/THaveSalaryNosocialMapper.xml

@@ -94,7 +94,8 @@
 		a.SETTLEMENT_ORGAN_NAME,
 		a.month,
 		a.relay_salary,
-		a.CREATE_NAME
+		a.CREATE_NAME,
+               a.feed_back,a.reason_type
         FROM t_have_salary_nosocial a
         <include refid="querPage"/>
     </select>

yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryStandardMapper.xml

@@ -265,6 +265,18 @@
         </where>
 		ORDER BY a.CREATE_TIME desc
     </select>
+	<!--tSalaryStandard简单分页查询-->
+	<select id="getTSalaryStandardPageApply" resultMap="tSalaryStandardMap">
+		SELECT
+		<include refid="Base_Column_List"/>
+		FROM t_salary_standard a
+		<where>
+			a.DELETE_FLAG = 0
+			<!-- 薪资是否可查看 0 是 1否-->
+			<include refid="tSalaryStandard_where"/>
+		</where>
+		ORDER BY a.CREATE_TIME desc
+	</select>
 	<!--tSalaryStandard简单分页查询-->
 	<select id="getTSalaryStandardAuditPage" resultMap="tSalaryStandardMap">
 		SELECT