Commit eef2f929 authored by fangxinjiang's avatar fangxinjiang

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

# Conflicts:
#	yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/FileUploadServiceImpl.java
#	yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialFriendServiceImpl.java
parents ef565eaa 294d79eb
......@@ -105,5 +105,13 @@ public class TCompleteMonitorSetBaseInfo {
@ExcelProperty("表名称")
@Schema(description = "表名称")
private String baseTable;
/**
* 属性字段
*/
@ExcelAttribute(name = "属性字段", maxLength = 100)
@Length(max = 100, message = "属性字段不能超过100个字符")
@ExcelProperty("属性字段")
@Schema(description = "属性字段")
private String baseField;
}
......@@ -185,5 +185,19 @@ public class TMainExportAllVO {
@ExcelAttribute(needExport = true, name ="不良记录描述")
private String field63;
// 2025-2-27 17:07:09新增
@ExcelAttribute(needExport = true, name ="银行卡号")
private String field73;
@ExcelAttribute(needExport = true, name ="开户总行")
private String field74;
@ExcelAttribute(needExport = true, name ="开户省")
private String field75;
@ExcelAttribute(needExport = true, name ="开户市")
private String field76;
@ExcelAttribute(needExport = true, name ="开户支行")
private String field77;
@ExcelAttribute(needExport = true, name ="计税月份")
private String field78;
}
......@@ -58,4 +58,17 @@ public class TCompleteMonitorSetBaseInfoController {
return R.ok(tCompleteMonitorSetBaseInfoService.getListByBaseType(baseType));
}
/**
* @param typeName 员工合同名称
* @Description: 根据员工合同名称,获取需要完整的字段
* @Author: hgw
* @Date: 2025/2/27 11:49
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.util.List < com.yifu.cloud.plus.v1.yifu.archives.entity.TCompleteMonitorSetBaseInfo>>
**/
@Operation(summary = "根据员工合同名称,获取需要完整的字段", description = "根据员工合同名称,获取需要完整的字段")
@GetMapping("/getBaseFieldByTypeName")
public R<List<String>> getBaseFieldByTypeName(@RequestParam String typeName) {
return R.ok(tCompleteMonitorSetBaseInfoService.getBaseFieldByTypeName(typeName));
}
}
......@@ -41,4 +41,9 @@ public interface TCompleteMonitorSetBaseInfoMapper extends BaseMapper<TCompleteM
**/
List<TCompleteMonitorSetBaseInfo> getBaseInfoByIds(@Param("ids") String ids);
// 获取类型需要完整的字段名
List<String> getIdByType(@Param("typeName") String typeName);
List<String> getIdByOne();
List<String> getBaseFieldByIdList(@Param("idList") List<String> idList);
}
......@@ -31,4 +31,6 @@ import java.util.List;
public interface TCompleteMonitorSetBaseInfoService extends IService<TCompleteMonitorSetBaseInfo> {
List<TCompleteMonitorSetBaseInfo> getListByBaseType(String baseType);
List<String> getBaseFieldByTypeName(String typeName);
}
......@@ -539,6 +539,13 @@ public class TCompleteMonitorServiceImpl extends ServiceImpl<TCompleteMonitorMap
headList.add(this.getNewArrayList(new String[]{oneTitle, "是否从事过井下、高空、高温、特别繁重体力劳动以及有毒有害工种"}));
oneTitle = "不良记录";
headList.add(this.getNewArrayList(new String[]{oneTitle, "不良记录描述"}));
oneTitle = "银行卡信息";
headList.add(this.getNewArrayList(new String[]{oneTitle, "银行卡号"}));
headList.add(this.getNewArrayList(new String[]{oneTitle, "开户总行"}));
headList.add(this.getNewArrayList(new String[]{oneTitle, "开户省"}));
headList.add(this.getNewArrayList(new String[]{oneTitle, "开户市"}));
headList.add(this.getNewArrayList(new String[]{oneTitle, "开户支行"}));
headList.add(this.getNewArrayList(new String[]{oneTitle, "计税月份"}));
Set<String> titleContent = getExportFieldNameDetailByClass(TMainExportAllVO.class);
//ExcelUtil<TMainExportAllVO> util = new ExcelUtil<>(TMainExportAllVO.class)
......
......@@ -26,6 +26,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
import lombok.extern.log4j.Log4j2;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
/**
......@@ -48,4 +49,27 @@ public class TCompleteMonitorSetBaseInfoServiceImpl extends ServiceImpl<TComplet
return baseMapper.selectList(wrapper);
}
/**
* @param typeName 类型名称
* @Description:
* @Author: hgw
* @Date: 2025/2/27 21:19
* @return: java.util.List<java.lang.String>
**/
@Override
public List<String> getBaseFieldByTypeName(String typeName) {
List<String> idList = baseMapper.getIdByType(typeName);
// 取默认配置
if (idList == null || idList.isEmpty() || "-1".equals(typeName)) {
idList = baseMapper.getIdByOne();
}
if (idList == null || idList.isEmpty()) {
// -1表示不可以
List<String> stringList = new ArrayList<>();
stringList.add("-1");
return stringList;
}
return baseMapper.getBaseFieldByIdList(idList);
}
}
......@@ -361,6 +361,7 @@
,e.HIGN_EDUCATION field40
,if(e.FIRST_WORK_FLAG is null,'',if(e.FIRST_WORK_FLAG=0,'是','否')) field43
,if(e.HAVE_QUALIFICATION is null,'',if(e.HAVE_QUALIFICATION=0,'是','否')) field51
,e.BANK_NO field73,e.BANK_NAME field74,e.BANK_PROVINCE field75,e.BANK_CITY field76,e.BANK_SUB_NAME field77,e.TAX_MONTH field78
FROM t_complete_monitor a
left join t_employee_project p on a.DEPT_NO=p.DEPT_NO
left join t_employee_info e on p.EMP_ID=e.id
......
......@@ -32,6 +32,7 @@
<result property="isMonitor" column="IS_MONITOR"/>
<result property="baseColumn" column="BASE_COLUMN"/>
<result property="baseTable" column="BASE_TABLE"/>
<result property="baseField" column="BASE_FIELD"/>
</resultMap>
<!--获取ids对应的所有的配置字段-->
......@@ -41,4 +42,24 @@
where a.id in (${ids})
GROUP BY a.BASE_TABLE
</select>
<!-- 获取属性字段 -->
<select id="getIdByType" resultType="java.lang.String">
select s.BASE_ID from t_complete_monitor_set s where s.CONTRACT_TYPE_NAME like concat('%', #{typeName},'%')
</select>
<!-- 获取属性字段 -->
<select id="getIdByOne" resultType="java.lang.String">
select s.BASE_ID from t_complete_monitor_set s where s.id = '1'
</select>
<!-- 获取属性字段 -->
<select id="getBaseFieldByIdList" resultType="java.lang.String">
SELECT BASE_FIELD
FROM t_complete_monitor_set_base_info a
where a.id in
<foreach item="idStr" index="index" collection="idList" open="("
separator="," close=")">
#{idStr}
</foreach>
</select>
</mapper>
......@@ -60,11 +60,11 @@
<if test="tCompleteMonitorSet.contractType != null and tCompleteMonitorSet.contractType.trim() != ''">
AND a.CONTRACT_TYPE = #{tCompleteMonitorSet.contractType}
</if>
<if test="tEmployeeProject.contractTypeArray != null and tEmployeeProject.contractTypeArray.length > 0">
AND a.CONTRACT_TYPE in
<foreach item="idStr" index="index" collection="tEmployeeProject.contractTypeArray" open="("
separator="," close=")">
#{idStr}
<if test="tCompleteMonitorSet.contractTypeArray != null and tCompleteMonitorSet.contractTypeArray.length > 0">
AND
<foreach item="idStr" index="index" collection="tCompleteMonitorSet.contractTypeArray" open="("
separator=" or " close=")">
a.CONTRACT_TYPE_NAME like concat('%',#{idStr},'%')
</foreach>
</if>
<if test="tCompleteMonitorSet.baseId != null and tCompleteMonitorSet.baseId.trim() != ''">
......
......@@ -85,7 +85,7 @@ public class FileUploadServiceImpl implements FileUploadService {
true,
"1", authorities, "1",
null, null,
null,null);
null, null);
attaInfo.setCreateBy(user.getId());
attaInfo.setCreateName(user.getNickname());
attaInfo = tAttaInfoService.add(attaInfo);
......
......@@ -79,7 +79,7 @@ public class TSocialFriendServiceImpl extends ServiceImpl<TSocialFriendMapper, T
true,
"1", authorities, "1",
null, null,
null,null);
null, null);
// 失败原因配置
Map<String, FailReasonConfig> errorMap = failReasonConfigService.getFailReasonMap();
// 获取所有需要反馈的任务id
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment