Commit 0855b173 authored by 李灿灿's avatar 李灿灿

Merge branch 'develop' into feature-licancan

parents 4fa08d0c 192f96a5
......@@ -90,7 +90,7 @@ public class TEmployeeContractInfo extends BaseEntity {
*/
@NotBlank(message = "合同类型不能为空")
@Length(max = 32, message = "合同类型不能超过32个字符")
@ExcelAttribute(name = "合同类型", isNotEmpty = true, errorInfo = "合同类型不能为空", maxLength = 32, needExport = true)
@ExcelAttribute(name = "合同类型", maxLength = 32, needExport = true)
@Schema(description = "合同类型", name = "contractName")
private String contractName;
/**
......@@ -101,14 +101,14 @@ public class TEmployeeContractInfo extends BaseEntity {
*/
@NotBlank(message = "签订期限不能为空")
@Length(max = 32, message = "签订期限不能超过32个字符")
@ExcelAttribute(name = "签订期限", isNotEmpty = true, errorInfo = "签订期限不能为空", maxLength = 32, isDataId = true, dataType = ExcelAttributeConstants.EMPLOYEE_CONTRACT_TYPE, needExport = true)
@ExcelAttribute(name = "签订期限", maxLength = 32, isDataId = true, dataType = ExcelAttributeConstants.EMPLOYEE_CONTRACT_TYPE, needExport = true)
@Schema(description = "签订期限", name = "contractType")
private String contractType;
/**
* 合同起始时间
*/
@NotBlank(message = "合同起始时间不能为空")
@ExcelAttribute(name = "合同起始时间", isNotEmpty = true, errorInfo = "合同起始时间不能为空")
@ExcelAttribute(name = "合同起始时间", needExport = true)
@Schema(description = "合同起始时间", name = "contractStart")
private Date contractStart;
/**
......@@ -210,14 +210,14 @@ public class TEmployeeContractInfo extends BaseEntity {
* 合同岗位
*/
@Length(max = 32, message = "合同岗位不能超过32个字符")
@ExcelAttribute(name = "合同岗位", isNotEmpty = true, errorInfo = "合同岗位不能为空", maxLength = 32, needExport = true)
@ExcelAttribute(name = "合同岗位", maxLength = 32, needExport = true)
@Schema(description = "合同岗位", name = "post")
private String post;
/**
* 工时制(数据字典) 1标准工时 2 综合工时 3不定时工时制
*/
@Length(max = 32, message = "工时制不能超过32个字符")
@ExcelAttribute(name = "工时制", isNotEmpty = true, errorInfo = "工时制不能为空", maxLength = 32, isDataId = true, dataType = ExcelAttributeConstants.WORKING_HOURS)
@ExcelAttribute(name = "工时制", maxLength = 32, isDataId = true, dataType = ExcelAttributeConstants.WORKING_HOURS)
@Schema(description = "工时制(数据字典) 1标准工时 2 综合工时 3不定时工时制", name = "workingHours")
private String workingHours;
/**
......@@ -413,7 +413,7 @@ public class TEmployeeContractInfo extends BaseEntity {
*/
@NotBlank(message = "合同甲方不能为空")
@Length(max = 50, message = "合同甲方不能超过50个字符")
@ExcelAttribute(name = "合同甲方", isNotEmpty = true, errorInfo = "合同甲方不能为空", maxLength = 50, needExport = true)
@ExcelAttribute(name = "合同甲方", maxLength = 50, needExport = true)
@Schema(description = "合同甲方")
@Size(max = 50, message = "合同甲方不可超过50位")
private String contractParty;
......
......@@ -76,7 +76,7 @@ public class EmployeeContractVO extends RowIndex implements Serializable {
*/
@NotBlank(message = "合同类型不能为空")
@Length(max = 32, message = "合同类型不能超过32个字符")
@ExcelAttribute(name = "合同类型", isNotEmpty = true, errorInfo = "合同类型不能为空", maxLength = 32, needExport = true)
@ExcelAttribute(name = "合同类型", maxLength = 32, needExport = true)
@Schema(description = "合同类型", name = "contractName")
private String contractName;
......@@ -101,7 +101,7 @@ public class EmployeeContractVO extends RowIndex implements Serializable {
* 合同甲方
*/
@Length(max = 50, message = "原因说明不能超过200个字符")
@ExcelAttribute(name = "合同甲方", isNotEmpty = true, errorInfo = "合同甲方不能为空", maxLength = 50, needExport = true)
@ExcelAttribute(name = "合同甲方", maxLength = 50, needExport = true)
@Schema(description = "合同甲方")
@Size(max = 50, message = "合同甲方不可超过50位")
private String contractParty;
......@@ -114,7 +114,7 @@ public class EmployeeContractVO extends RowIndex implements Serializable {
*/
@NotBlank(message = "签订期限不能为空")
@Length(max = 32, message = "签订期限不能超过32个字符")
@ExcelAttribute(name = "签订期限", isNotEmpty = true, errorInfo = "签订期限不能为空", maxLength = 32, isDataId = true, dataType = ExcelAttributeConstants.EMPLOYEE_CONTRACT_TYPE, needExport = true)
@ExcelAttribute(name = "签订期限", maxLength = 32, isDataId = true, dataType = ExcelAttributeConstants.EMPLOYEE_CONTRACT_TYPE, needExport = true)
@Schema(description = "签订期限", name = "contractType")
private String contractType;
......@@ -123,7 +123,7 @@ public class EmployeeContractVO extends RowIndex implements Serializable {
*/
@NotBlank(message = "起始日期不能为空")
@DateTimeFormat("yyyy-MM-dd")
@ExcelAttribute(name = "起始日期", isNotEmpty = true, errorInfo = "起始日期不能为空", isDate = true)
@ExcelAttribute(name = "起始日期", isDate = true)
@Schema(description = "起始日期", name = "contractStart")
private Date contractStart;
/**
......@@ -138,7 +138,7 @@ public class EmployeeContractVO extends RowIndex implements Serializable {
* 合同岗位
*/
@Length(max = 32, message = "合同岗位不能超过32个字符")
@ExcelAttribute(name = "合同岗位", isNotEmpty = true, errorInfo = "合同岗位不能为空", maxLength = 32, needExport = true)
@ExcelAttribute(name = "合同岗位", maxLength = 32, needExport = true)
@Schema(description = "合同岗位", name = "post")
private String post;
......@@ -146,7 +146,7 @@ public class EmployeeContractVO extends RowIndex implements Serializable {
* 工时制(数据字典) 1标准工时 2 综合工时 3不定时工时制
*/
@Length(max = 32, message = "工时制不能超过32个字符")
@ExcelAttribute(name = "工时制", isNotEmpty = true, errorInfo = "工时制不能为空", maxLength = 32, isDataId = true, dataType = ExcelAttributeConstants.WORKING_HOURS)
@ExcelAttribute(name = "工时制", maxLength = 32, isDataId = true, dataType = ExcelAttributeConstants.WORKING_HOURS)
@Schema(description = "工时制(数据字典) 1标准工时 2 综合工时 3不定时工时制", name = "workingHours")
private String workingHours;
......
......@@ -41,6 +41,13 @@ public class EmployeeConstants {
public static final String CONTRACT_TYPE_TWO = "2";
public static final String CONTRACT_NO_IN_USE = "暂无可操作的合同";
public static final String CONTRACT_NAME_EMPTY = "合同类型不能为空";
public static final String CONTRACT_PARTY_EMPTY = "合同甲方不能为空";
public static final String CONTRACT_TYPE_EMPTY = "签订期限不能为空";
public static final String CONTRACT_START_EMPTY = "起始日期不能为空";
public static final String POST_EMPTY = "合同岗位不能为空";
public static final String WORKING_HOURS_EMPTY = "工时制不能为空";
/**
* 无数据可更新
**/
......
......@@ -27,12 +27,14 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprCheckProperties;
import com.yifu.cloud.plus.v1.yifu.common.dapr.util.SettleDomainUtil;
import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
import lombok.extern.log4j.Log4j2;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
......@@ -57,7 +59,6 @@ import java.util.List;
public class TEmpFamilyController {
private final DaprCheckProperties daprCheckProperties;
private final TEmpFamilyService tEmpFamilyService;
/**
* 分页查询
* @param page 分页对象
......
......@@ -34,6 +34,7 @@ import lombok.RequiredArgsConstructor;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.List;
......
......@@ -438,7 +438,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
}
if (contractInfo.getAuditStatus() != CommonConstants.ZERO_INT
&& contractInfo.getAuditStatus() != CommonConstants.dingleDigitIntArray[3]) {
return R.failed("不是待审核或审核不通过,无法删除");
return R.failed("不是待提交或审核不通过,无法删除");
}
contractInfo.setDeleteFlag(CommonConstants.ONE_INT);
this.updateById(contractInfo);
......@@ -703,21 +703,49 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
if (EmployeeConstants.OTHERS.equals(insert.getContractName()) && Common.isEmpty(insert.getContractSubName())) {
errorInfo.append(EmployeeConstants.SUB_MUST);
}
if (!EmployeeConstants.CONTRACT_TYPE_TWO.equals(insert.getContractType())
&& Common.isEmpty(insert.getContractEnd())) {
errorInfo.append(EmployeeConstants.CONTRACT_END_MUST);
}
if (Common.isEmpty(insert.getEmpIdcard()) || Common.isEmpty(insert.getDeptNo())) {
errorInfo.append(EmployeeConstants.EMPID_NOT_EMPTY);
} else if (EmployeeConstants.SITUATION_SIX.equals(insert.getSituation())
|| EmployeeConstants.SITUATION_SEVEN.equals(insert.getSituation())) {
TEmployeeContractInfo contractInfo = this.getOne(Wrappers.<TEmployeeContractInfo>query().lambda()
.eq(TEmployeeContractInfo::getEmpIdcard, insert.getEmpIdcard())
.eq(TEmployeeContractInfo::getDeptNo, insert.getDeptNo())
.eq(TEmployeeContractInfo::getDeleteFlag, CommonConstants.ZERO_INT)
.eq(TEmployeeContractInfo::getInUse, CommonConstants.ZERO_STRING).last(CommonConstants.LAST_ONE_SQL));
if (contractInfo == null) {
errorInfo.append(EmployeeConstants.CONTRACT_NO_IN_USE);
} else {
if (EmployeeConstants.SITUATION_SIX.equals(insert.getSituation())
|| EmployeeConstants.SITUATION_SEVEN.equals(insert.getSituation())) {
TEmployeeContractInfo contractInfo = this.getOne(Wrappers.<TEmployeeContractInfo>query().lambda()
.eq(TEmployeeContractInfo::getEmpIdcard, insert.getEmpIdcard())
.eq(TEmployeeContractInfo::getDeptNo, insert.getDeptNo())
.eq(TEmployeeContractInfo::getDeleteFlag, CommonConstants.ZERO_INT)
.eq(TEmployeeContractInfo::getInUse, CommonConstants.ZERO_STRING).last(CommonConstants.LAST_ONE_SQL));
if (contractInfo == null) {
errorInfo.append(EmployeeConstants.CONTRACT_NO_IN_USE);
} else {
insert.setContractName(contractInfo.getContractName());
insert.setSubjectUnit(contractInfo.getSubjectUnit());
insert.setContractParty(contractInfo.getContractParty());
insert.setContractType(contractInfo.getContractType());
insert.setContractStart(contractInfo.getContractStart());
insert.setContractEnd(contractInfo.getContractEnd());
}
} else {
if (!EmployeeConstants.CONTRACT_TYPE_TWO.equals(insert.getContractType())
&& Common.isEmpty(insert.getContractEnd())) {
errorInfo.append(EmployeeConstants.CONTRACT_END_MUST);
}
if (Common.isEmpty(insert.getContractName())) {
errorInfo.append(EmployeeConstants.CONTRACT_NAME_EMPTY);
}
if (Common.isEmpty(insert.getContractParty())) {
errorInfo.append(EmployeeConstants.CONTRACT_PARTY_EMPTY);
}
if (Common.isEmpty(insert.getContractType())) {
errorInfo.append(EmployeeConstants.CONTRACT_TYPE_EMPTY);
}
if (Common.isEmpty(insert.getContractStart())) {
errorInfo.append(EmployeeConstants.CONTRACT_START_EMPTY);
}
if (Common.isEmpty(insert.getPost())) {
errorInfo.append(EmployeeConstants.POST_EMPTY);
}
if (Common.isEmpty(insert.getWorkingHours())) {
errorInfo.append(EmployeeConstants.WORKING_HOURS_EMPTY);
}
}
}
if (Common.isEmpty(errorInfo.toString())) {
......
......@@ -234,6 +234,9 @@ public interface CommonConstants {
String RESULT_EMPTY = "获取结果为空";
//错误信息
String ERROR_NO_DOMAIN = "无此实体!";
/**
* @Author fxj
* @Date 2020-03-12 14:48
......@@ -339,4 +342,8 @@ public interface CommonConstants {
* 获取登录用户信息失败
**/
public static final String USER_FAIL = "获取登录用户信息失败!";
public static final int SIXTEEN_INT = 16;
public static final String FIFTEEN = "15";
public static final String NINETEEN = "19";
}
......@@ -116,4 +116,7 @@ public class ExcelAttributeConstants {
public static final String WORKINFO_TYPE = "workinfo_type";
// 项目档案来源
public static final String PROJECT_EMP_SOURCE = "project_emp_source";
//区域字段组合
public static final String DEPARTID_PROVINCE_CITY_TOWN = "departId_province_city_town";
}
......@@ -5,10 +5,8 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
import java.util.List;
import java.math.BigDecimal;
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
......@@ -241,4 +239,63 @@ public class Common {
}
}
public static <T> HashMap<String, T> listToHashMapByKey(List<T> list, String keyPreStr, String filedKey) {
HashMap<String, T> hashMap = new HashMap<String,T>();
Object key = null;
String[] split = null;
if (null != list) {
if (filedKey.indexOf(CommonConstants.DOWN_LINE_CHAR) > CommonConstants.dingleDigitIntArray[0]) {
split = filedKey.split(CommonConstants.DOWN_LINE_STRING);
for (T t : list) {
key= null;
key = getFieldsValue(t, split, key);
hashMap.put(keyPreStr +CommonConstants.DOWN_LINE_STRING+ getStringValByObject(key), t);
}
} else {
for (T t : list) {
key= null;
key = getFieldValueByName(filedKey, t);
hashMap.put(keyPreStr +CommonConstants.DOWN_LINE_STRING+ getStringValByObject(key), t);
}
}
}
return hashMap;
}
/**
* 从实体中获取多个字段的值并已下划线分割
*
* @param t
* @param split
* @return
* @Author fxj
* @Date 2019-09-24
**/
private static <T> Object getFieldsValue(T t, String[] split, Object key) {
int i = 0;
while (i < split.length) {
if (null == key || CommonConstants.EMPTY_STRING.equals(key)) {
key = getFieldValueByName(split[i], t);
} else {
key = key + CommonConstants.DOWN_LINE_STRING + getFieldValueByName(split[i], t);
}
i++;
}
return key;
}
/**
* 如果为空或零 返回true 否则 返回false
* @Author fxj
* @Date 2020-12-29
* @param data
* @return
**/
public static boolean isNullOrZero(BigDecimal data) {
if (null == data ||
BigDecimal.ZERO.compareTo(data) == CommonConstants.ZERO_INT){
return true;
}
return false;
}
}
......@@ -861,15 +861,18 @@ public class DateUtil {
/**
* @param startDate
* @param endDate
* @Description: 计算年月的月份差值(202205-202205=0)想要1自己+1
* @Description: 计算年月的月份差值(202205-202205=0,202205-202105=12)想要1自己+1 年月差值
* @Author: hgw
* @Date: 2022/7/15 12:16
* @return: int
**/
public static int getMonthDiff(Date startDate, Date endDate) {
try {
SimpleDateFormat sdf = new SimpleDateFormat(DATETIME_YYYYMM);
return Integer.parseInt(sdf.format(endDate)) - Integer.parseInt(sdf.format(startDate));
Calendar c1 = Calendar.getInstance();
Calendar c2 = Calendar.getInstance();
c1.setTime(startDate);
c2.setTime(endDate);
return 12 * (c2.get(Calendar.YEAR) - c1.get(Calendar.YEAR)) + c2.get(Calendar.MONTH) - c1.get(Calendar.MONTH);
} catch (IllegalFormatException e) {
log.error("计算日期月份差,方法名:getMonthDiff,出错:",e);
return 0;
......
......@@ -4,10 +4,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import lombok.extern.log4j.Log4j2;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.http.*;
import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.client.RestTemplate;
......@@ -55,6 +52,45 @@ public class HttpDaprUtil {
return R.failed("获取信息失败!");
}
}
/**
* @param appUrl
* @param appId
* @param method
* @param param
* @param cs
* @return com.yifu.cloud.plus.v1.yifu.common.core.util.R<T>
* @author fxj
* @date 2022-05-23 17:56
* @description get请求获取指定对象信息
**/
public static <T> R<T> invokeMethodGet(String appUrl,
String appId,
String method,
String param,
Class cs,
@RequestHeader(SecurityConstants.FROM) String from) {
// 实例化 RestTemplate
initResTemplate();
// 初始化请求URL
initUrl(appUrl, appId, method, param);
ResponseEntity<T> res;
HttpHeaders headers = new HttpHeaders();
headers.add(SecurityConstants.FROM, from);
headers.setContentType(MediaType.APPLICATION_JSON);
headers.add("Authorization", null);
HttpEntity<String> entity = new HttpEntity(param, headers);
try {
res = restTemplate.exchange(stringBuffer.toString(), HttpMethod.GET,entity,cs);
} catch (Exception e) {
return R.failed("获取信息失败:" + e.getMessage());
}
if (null != res && CommonConstants.SUCCESS == res.getStatusCodeValue()) {
return R.ok(res.getBody());
} else {
return R.failed("获取信息失败!");
}
}
public static <T> R<T> invokeMethodPost(String appUrl,
String appId,
......
......@@ -18,13 +18,12 @@ import java.util.List;
* @Version 1.0
*/
@Log4j2
@Component
@EnableConfigurationProperties(DaprArchivesProperties.class)
public class SettleDomainUtil {
@Autowired
private DaprArchivesProperties daprArchivesProperties;
public R<List<String>> getSettleDomainIdsByUserId(){
R<List<String>> res = HttpDaprUtil.invokeMethodPost(daprArchivesProperties.getAppUrl(),daprArchivesProperties.getAppId(),"/tsettledomain/getSettleDomainIdsByUserId","", Object.class, SecurityConstants.FROM_IN);
R<List<String>> res = HttpDaprUtil.invokeMethodGet(daprArchivesProperties.getAppUrl(),daprArchivesProperties.getAppId(),"/tsettledomain/getSettleDomainIdsByUserId","", Object.class, SecurityConstants.FROM_IN);
if (Common.isEmpty(res)){
return R.failed("获取用户项目权限失败!");
}
......
package com.yifu.cloud.plus.v1.yifu.common.dapr.util;
import com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysArea;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants;
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.common.dapr.config.DaprArchivesProperties;
import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprUpmsProperties;
import lombok.extern.log4j.Log4j2;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import java.util.List;
/**
* @Author fxj
* @Date 2022/7/11
* @Description
* @Version 1.0
*/
@Log4j2
@EnableConfigurationProperties(DaprUpmsProperties.class)
public class UpmsDaprUtils {
@Autowired
private DaprUpmsProperties daprUpmsProperties;
/**
* 获取所有区域数据
* @Author huyc
* @Date 2022-07-18
* @return
**/
public R<List<SysArea>> getAreaListR() {
R<List<SysArea>> areaListR = HttpDaprUtil.invokeMethodPost(daprUpmsProperties.getAppUrl(),daprUpmsProperties.getAppId(),"/area/inner/getSysAreaList","", SysArea.class, SecurityConstants.FROM_IN);
if (Common.isEmpty(areaListR)){
return R.failed("获取所有区域数据失败!");
}
return areaListR;
}
}
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
com.yifu.cloud.plus.v1.yifu.common.dapr.util.SettleDomainUtil
dapr.upms.appUrl=http://yifu-upms.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
dapr.upms.appUrl=http://localhost:3500/v1.0/invoke/
dapr.upms.appId=yifu-upms
dapr.upms.appPort=4000
dapr.upms.httpPort=3500
......@@ -6,11 +6,18 @@ dapr.upms.grpcPort=52000
dapr.upms.metricsPort=9094
#\u6D4B\u8BD5\u73AF\u5883
dapr.check.appUrl=http://yifu-check.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
#dapr.check.appUrl=http://yifu-check.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
#\u672C\u5730
#dapr.check.appUrl=http://localhost:3502/v1.0/invoke/
dapr.check.appUrl=http://localhost:3507/v1.0/invoke/
dapr.check.appId=yifu-check
dapr.check.appPort=5022
dapr.check.httpPort=3502
dapr.check.grpcPort=52002
dapr.check.metricsPort=9092
\ No newline at end of file
#dapr.check.appPort=5022
#dapr.check.httpPort=3502
#dapr.check.grpcPort=52002
#dapr.check.metricsPort=9092
dapr.social.appUrl=http://localhost:3509/v1.0/invoke/
dapr.social.appId\uFF1B
dapr.social.appPort=5002
dapr.social.httpPort=3509
dapr.social.grpcPort=52003
dapr.social.metricsPort=9093
\ No newline at end of file
package com.yifu.cloud.plus.v1.yifu.insurances.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.io.Serializable;
/**
* @author zhaji
* @description 保险公司实体
* @date 2022-07-18 14:12:35
*/
@Data
@TableName("t_insurance_company")
@EqualsAndHashCode()
@Schema(description = "保险公司实体类")
public class TInsuranceCompanyInfo implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 保险公司id
*/
private String id;
/**
* 保险公司名称
*/
private String companyName;
/**
* 保险公司地址
*/
private String companyAddress;
/**
* 对接人
*/
private String companyDocking;
/**
* 创建人
*/
private String createBy;
/**
* 创建人姓名
*/
private String createName;
/**
* 创建时间
*/
private String createTime;
/**
* 更新人
*/
private String updateBy;
/**
* 更新时间
*/
private String updateTime;
/**
* 删除标志
*/
private String deleteFlag;
}
package com.yifu.cloud.plus.v1.yifu.insurances.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.io.Serializable;
/**
* @author zhaji
* @description 险种实体类
* @date 2022-07-18 14:00:42
*/
@Data
@TableName("t_insurance_type")
@EqualsAndHashCode()
@Schema(description = "险种实体类")
public class TInsuranceTypeInfo implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 险种id
*/
private String id;
/**
* 险种名称
*/
private String name;
/**
* 保险公司主键ID
*/
private String insuranceCompanyId;
/**
* 收款单位名称
*/
private String receiptUnitName;
/**
* 收款银行名称
*/
private String bankName;
/**
* 收款银行账号
*/
private String bankNo;
/**
* 创建时间
*/
private String createTime;
/**
* 创建人
*/
private String createBy;
/**
* 更新时间
*/
private String updateTime;
/**
* 更新人
*/
private String updateBy;
/**
* 删除标志
*/
private String deleteFlag;
}
package com.yifu.cloud.plus.v1.yifu.insurances.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
/**
* @author zhaji
* @description 费率实体类
* @date 2022-07-18 15:48:24
*/
@Data
@TableName("t_insurance_type_rate")
@EqualsAndHashCode()
@Schema(description = "费率实体类")
public class TInsuranceTypeRate implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 费率id
*/
private String id ;
/**
* 险种id
*/
private String insuranceTypeId ;
/**
* 月数
*/
private String month ;
/**
* 费率
*/
private String rate ;
}
package com.yifu.cloud.plus.v1.yifu.insurances.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.io.Serializable;
/**
* @author zhaji
* @description 购买标准表
* @date 2022-07-18 14:52:03
*/
@Data
@TableName("t_insurance_type_standard")
@EqualsAndHashCode()
@Schema(description = "购买标准实体类")
public class TInsuranceTypeStandardInfo implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 购买标准id
*/
private String id ;
/**
* 险种ID
*/
private String insuranceTypeId ;
/**
* 购买标准
*/
private String buyStandard ;
/**
* 类型
*/
private String type ;
/**
* 医疗额度
*/
private String medicalQuota ;
/**
* 身故或残疾额度
*/
private String dieDisableQuota ;
}
package com.yifu.cloud.plus.v1.yifu.social.constants;
public class PreDispatchConstants {
public static final String NO_PENSION_AREA_ADD = "获取缴纳地数据失败,请检查养老城市或公积金城市名称是否合规!";
public static final String NO_PENSION_AREA_REDUCE = "获取缴纳地数据失败,请检查养老截止城市或公积金截止城市名称是否合规!";
public static final String NO_PENSION_AREA= "请检查派单缴纳地名称是否合规!";
public static final String SOCIAL_START_DATE_ERROR = "社保起缴月份在可补缴月份之前,请确认后操作!";
public static final String NO_SOCIAL_BASE_SET_INFO = "未找到有效的社保基数配置信息(户+缴纳地+起缴时间)!";
public static final String FUND_START_DATE_ERROR = "公积金起缴月份在可补缴月份之前,请确认后操作!";
public static final String NO_FUND_BASE_SET_INFO = "未找到有效的公积金基数配置信息(户+缴纳地+起缴时间)!";
public static final String[] ADD_HEAD_INFO = {"日期","接单分公司","缴费地","客户名称","员工姓名","身份证号",
"联系电话1","联系电话2","入职日期","正式工资","派遣开始日期","派遣结束日期","合同开始日期","合同终止日期",
"试用开始日期","试用结束日期","试用期工资","工作制","合同版本","是否电话通知","实际工作地","备注说明1",
"备注说明2","养老城市","养老基数","养老起缴月","医疗城市","医疗基数","医疗起缴月","工伤城市","工伤基数",
"工伤起缴月","生育城市","生育基数","生育起缴月","失业城市","失业基数","失业起缴月","公积金城市","公积金基数",
"公积金个人比例","公积金企业比例","公积金起缴月","派单分公司","派单客服","小合同名称","唯一号","客户编号","服务类别"};
public static final String[] REDUCE_HEAD_INFO = {"日期","接单分公司","缴费地","客户名称","员工姓名","身份证号",
"离职日期","离职原因","联系电话1","联系电话2","备注说明1","养老城市","养老截止时间","医疗城市","医疗截止时间",
"工伤城市","工伤截止时间","生育城市","生育截止时间","失业城市","失业截止时间","公积金城市","公积金截止时间",
"派单分公司","派单客服","小合同名称","合同类型"};
public static final String HAED_ERROR = "请使用标准模板!";
public static final String POSITION = "服务";
public static final String CONTRACT_NAME = "代理社保";
public static final String DISPATCH_TYPE_ERROR = "派单类型有误,0-派增 1-派减!";
public static final String EMPIDCARD_IS_EMPTY = "身份证不可变更!";
public static final String EXISTS_SAME_EMPIDCARD_ADD = "当月已存在对应身份证的预派单信息!";
public static final String PREDISPATCH_EXCEPTION = "派单异常";
public static final String DISPATCH_ADD_SUCCESS = "派单成功";
public static final String NO_SOCIAL_CAN_REDUCE = "无社保数据可派减,请查看社保派增是否办理成功!";
public static final String NO_FUND_CAN_REDUCE = "无公积金数据可派减,请查看公积金派增是否办理成功!";
public static final String PRESTATUS_ERROR = "‘是否派单’为是且‘预派单状态’为正常未派单才可派单!";
public static final String CITY = "city";
public static final String TOWN = "town";
public static final String SOCIAL_CITY = "social_city";
public static final String SOCIAL_TOWN = "social_town";
public static final String FUND_CITY = "fund_city";
public static final String FUND_TOWN = "fund_town";
public static final String YES_CH = "是";
public static final String NO_CH = "否";
public static final String DATA_CHECK = "数据校验信息:";
public static final String DATA_HANDLE_RESULT = "数据导入结果:";
public static final String DATA_IMPORT_ANALYSIS_ERROR = "数据导入解析失败!";
public static final String IMPORT_PREDISPATCH = "导出预派单";
public static final String NO_SOCIAL_FUND_ADDRESS_ADD = "派增:养老城市和公积金城市不可同时为空,请确认表中有‘养老城市’和‘公积金城市’数据列及数据!";
public static final String NO_SOCIAL_FUND_ADDRESS_REDUCE = "派减:养老城市和公积金城市不可同时为空,请确认表中有‘养老城市’和‘公积金城市’数据列及数据!";
public static final String TEL_NOT_EMPTY = "联系电话1不可为空!";
public static final String TEL_INVALID = "联系电话1无效!";
public static final String GET_AREA_INFO = "获取区域数据失败!";
}
/*
* 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.yifu.social.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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.social.entity.TPaymentInfo;
import com.yifu.cloud.plus.v1.yifu.social.service.TPaymentInfoService;
import org.springframework.security.access.prepost.PreAuthorize;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpHeaders;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 缴费库
*
* @author huyc
* @date 2022-07-14 18:53:42
*/
@RestController
@RequiredArgsConstructor
@RequestMapping("/tpaymentinfo" )
@Tag(name = "缴费库管理")
@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
public class TPaymentInfoController {
private final TPaymentInfoService tPaymentInfoService;
/**
* 简单分页查询
* @param page 分页对象
* @param tPaymentInfo 缴费库
* @return
*/
@Operation(summary = "简单分页查询", description = "简单分页查询")
@GetMapping("/page")
public R<IPage<TPaymentInfo>> getTPaymentInfoPage(Page<TPaymentInfo> page, TPaymentInfo tPaymentInfo) {
return new R<>(tPaymentInfoService.getTPaymentInfoPage(page,tPaymentInfo));
}
/**
* 不分页查询
* @param tPaymentInfo 缴费库
* @return
*/
@Operation(summary = "不分页查询", description = "不分页查询")
@PostMapping("/noPage" )
public R<List<TPaymentInfo>> getTPaymentInfoNoPage(@RequestBody TPaymentInfo tPaymentInfo) {
return R.ok(tPaymentInfoService.list(Wrappers.query(tPaymentInfo)));
}
/**
* 通过id查询缴费库
* @param id id
* @return R
*/
@Operation(summary = "通过id查询", description = "通过id查询:hasPermission('social_tpaymentinfo_get')")
@GetMapping("/{id}" )
public R<TPaymentInfo> getById(@PathVariable("id" ) String id) {
return R.ok(tPaymentInfoService.getById(id));
}
/**
* 新增缴费库
* @param tPaymentInfo 缴费库
* @return R
*/
@Operation(summary = "新增缴费库", description = "新增缴费库:hasPermission('social_tpaymentinfo_add')")
@SysLog("新增缴费库" )
@PostMapping
@PreAuthorize("@pms.hasPermission('social_tpaymentinfo_add')" )
public R<Boolean> save(@RequestBody TPaymentInfo tPaymentInfo) {
return R.ok(tPaymentInfoService.save(tPaymentInfo));
}
/**
* 修改缴费库
* @param tPaymentInfo 缴费库
* @return R
*/
@Operation(summary = "修改缴费库", description = "修改缴费库:hasPermission('social_tpaymentinfo_edit')")
@SysLog("修改缴费库" )
@PutMapping
@PreAuthorize("@pms.hasPermission('social_tpaymentinfo_edit')" )
public R<Boolean> updateById(@RequestBody TPaymentInfo tPaymentInfo) {
return R.ok(tPaymentInfoService.updateById(tPaymentInfo));
}
/**
* 通过id删除缴费库
* @param id id
* @return R
*/
@Operation(summary = "通过id删除缴费库", description = "通过id删除缴费库:hasPermission('social_tpaymentinfo_del')")
@SysLog("通过id删除缴费库" )
@DeleteMapping("/{id}" )
@PreAuthorize("@pms.hasPermission('social_tpaymentinfo_del')" )
public R<Boolean> removeById(@PathVariable String id) {
return R.ok(tPaymentInfoService.removeById(id));
}
}
/*
* 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.yifu.social.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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.social.entity.TPreDispatchInfo;
import com.yifu.cloud.plus.v1.yifu.social.service.TPreDispatchInfoService;
import org.springframework.security.access.prepost.PreAuthorize;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpHeaders;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 预派单记录
*
* @author huyc
* @date 2022-07-14 18:53:42
*/
@RestController
@RequiredArgsConstructor
@RequestMapping("/tpredispatchinfo" )
@Tag(name = "预派单记录管理")
@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
public class TPreDispatchInfoController {
private final TPreDispatchInfoService tPreDispatchInfoService;
/**
* 简单分页查询
* @param page 分页对象
* @param tPreDispatchInfo 预派单记录
* @return
*/
@Operation(summary = "简单分页查询", description = "简单分页查询")
@GetMapping("/page")
public R<IPage<TPreDispatchInfo>> getTPreDispatchInfoPage(Page<TPreDispatchInfo> page, TPreDispatchInfo tPreDispatchInfo) {
return new R<>(tPreDispatchInfoService.getTPreDispatchInfoPage(page,tPreDispatchInfo));
}
/**
* 不分页查询
* @param tPreDispatchInfo 预派单记录
* @return
*/
@Operation(summary = "不分页查询", description = "不分页查询")
@PostMapping("/noPage" )
public R<List<TPreDispatchInfo>> getTPreDispatchInfoNoPage(@RequestBody TPreDispatchInfo tPreDispatchInfo) {
return R.ok(tPreDispatchInfoService.list(Wrappers.query(tPreDispatchInfo)));
}
/**
* 通过id查询预派单记录
* @param id id
* @return R
*/
@Operation(summary = "通过id查询", description = "通过id查询:hasPermission('social_tpredispatchinfo_get')")
@GetMapping("/{id}" )
@PreAuthorize("@pms.hasPermission('social_tpredispatchinfo_get')" )
public R<TPreDispatchInfo> getById(@PathVariable("id" ) String id) {
return R.ok(tPreDispatchInfoService.getById(id));
}
/**
* 新增预派单记录
* @param tPreDispatchInfo 预派单记录
* @return R
*/
@Operation(summary = "新增预派单记录", description = "新增预派单记录:hasPermission('social_tpredispatchinfo_add')")
@SysLog("新增预派单记录" )
@PostMapping
@PreAuthorize("@pms.hasPermission('social_tpredispatchinfo_add')" )
public R<Boolean> save(@RequestBody TPreDispatchInfo tPreDispatchInfo) {
return R.ok(tPreDispatchInfoService.save(tPreDispatchInfo));
}
/**
* 修改预派单记录
* @param tPreDispatchInfo 预派单记录
* @return R
*/
@Operation(summary = "修改预派单记录", description = "修改预派单记录:hasPermission('social_tpredispatchinfo_edit')")
@SysLog("修改预派单记录" )
@PutMapping
@PreAuthorize("@pms.hasPermission('social_tpredispatchinfo_edit')" )
public R<Boolean> updateById(@RequestBody TPreDispatchInfo tPreDispatchInfo) {
return tPreDispatchInfoService.update(tPreDispatchInfo);
}
/**
* 通过id删除预派单记录
* @param id id
* @return R
*/
@Operation(summary = "通过id删除预派单记录", description = "通过id删除预派单记录:hasPermission('social_tpredispatchinfo_del')")
@SysLog("通过id删除预派单记录" )
@DeleteMapping("/{id}" )
@PreAuthorize("@pms.hasPermission('social_tpredispatchinfo_del')" )
public R<Boolean> removeById(@PathVariable String id) {
return R.ok(tPreDispatchInfoService.removeById(id));
}
/**
* 修改资料是否提交:0 是 1 否
* @Author huyc
* @Date 2022-07-18
* @param ids
* @param status 0 是 1 否
* @return R
*/
@Operation(summary = "修改资料是否提交", description = "修改资料是否提交:status 0 是 1 否(social_tpredispatchinfo_edit)")
@SysLog("修改资料是否提交")
@PostMapping("/modifyDataSubmitStatus")
@PreAuthorize("@pms.hasPermission('social_tpredispatchinfo_edit')")
public R<Boolean> modifyDataSubmitStatus(@RequestParam(value = "ids",required = true)String ids,
@RequestParam(value = "status",required = true)String status) {
return tPreDispatchInfoService.modifyDataSubmitStatus(ids,status);
}
/**
* 清空预派单默认的派单合同信息
* @Author huyc
* @Date 2022-07-18
* @param ids
* @return R
**/
@Operation(summary = "清空预派单默认的派单合同信息", description = "清空预派单默认的派单合同信息(social_tpredispatchinfo_edit)")
@SysLog("清空预派单默认的派单合同信息")
@PostMapping("/clearContractInfo")
@PreAuthorize("@pms.hasPermission('social_tpredispatchinfo_edit')")
public R<Boolean> clearContractInfo(@RequestParam(value = "ids",required = true)String ids) {
return tPreDispatchInfoService.clearContractInfo(ids);
}
/**
* 更新预派单是否派单状态
* @Author huyc
* @Date 2022-07-18
* @param id
* @param dispatchFlag 0 派单 1 不派单
* @param cancelRemark 不派单 时填写
* @return R
**/
@Operation(summary = "更新预派单是否派单状态", description = "更新预派单是否派单状态(social_tpredispatchinfo_edit)")
@SysLog("更新预派单是否派单状态")
@PostMapping("/updateDispatchFlag")
@PreAuthorize("@pms.hasPermission('social_tpredispatchinfo_edit')")
public R<Boolean> updateDispatchFlag(@RequestParam(value = "id",required = true)String id,
@RequestParam(value = "dispatchFlag",required = true)String dispatchFlag,
@RequestParam(value = "cancelRemark",required = false)String cancelRemark) {
return tPreDispatchInfoService.updateDispatchFlag(id,dispatchFlag,cancelRemark);
}
/**
* 单个派单
* @Author huyc
* @Date 2022-07-18
* @param id
* @return R
*/
@Operation(summary = "单个派单:按创建人和ID", description = "单个派单:按创建人和ID")
@PostMapping("/dispatchById")
public R<Boolean> dispatchById(@RequestParam(value = "id",required = true)String id) {
return tPreDispatchInfoService.dispatchById(id);
}
}
......@@ -24,6 +24,8 @@ import com.yifu.cloud.plus.v1.yifu.social.entity.SysBaseSetInfo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 基数设置表
*
......@@ -39,4 +41,6 @@ public interface SysBaseSetInfoMapper extends BaseMapper<SysBaseSetInfo> {
* @return
*/
IPage<SysBaseSetInfo> getSysBaseSetInfoPage(Page<SysBaseSetInfo> page, @Param("sysBaseSetInfo") SysBaseSetInfo sysBaseSetInfo);
List<SysBaseSetInfo> getAllByEntity(@Param("sysBaseSetInfo")SysBaseSetInfo sysBaseSetInfo);
}
/*
* 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.yifu.social.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.yifu.social.entity.TPaymentInfo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
/**
* 缴费库
*
* @author huyc
* @date 2022-07-14 18:53:42
*/
@Mapper
public interface TPaymentInfoMapper extends BaseMapper<TPaymentInfo> {
/**
* 缴费库简单分页查询
* @param tPaymentInfo 缴费库
* @return
*/
IPage<TPaymentInfo> getTPaymentInfoPage(Page<TPaymentInfo> page, @Param("tPaymentInfo") TPaymentInfo tPaymentInfo);
}
/*
* 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.yifu.social.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.yifu.social.entity.TPreDispatchInfo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 预派单记录
*
* @author huyc
* @date 2022-07-14 18:53:42
*/
@Mapper
public interface TPreDispatchInfoMapper extends BaseMapper<TPreDispatchInfo> {
/**
* 预派单记录简单分页查询
* @param tPreDispatchInfo 预派单记录
* @return
*/
IPage<TPreDispatchInfo> getTPreDispatchInfoPage(Page<TPreDispatchInfo> page, @Param("tPreDispatchInfo") TPreDispatchInfo tPreDispatchInfo);
void clearContractInfo(List<String> idList);
void modifyDataSubmitStatus(@Param("idList")List<String> idList, @Param("status")String status);
int updatePreDispatchInfoById(TPreDispatchInfo tPreDispatchInfo);
}
/*
* 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.yifu.social.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.yifu.social.entity.TPaymentInfo;
/**
* 缴费库
*
* @author huyc
* @date 2022-07-14 18:53:42
*/
public interface TPaymentInfoService extends IService<TPaymentInfo> {
/**
* 缴费库简单分页查询
* @param tPaymentInfo 缴费库
* @return
*/
IPage<TPaymentInfo> getTPaymentInfoPage(Page<TPaymentInfo> page, TPaymentInfo tPaymentInfo);
}
/*
* 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.yifu.social.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.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.social.entity.TPreDispatchInfo;
/**
* 预派单记录
*
* @author huyc
* @date 2022-07-14 18:53:42
*/
public interface TPreDispatchInfoService extends IService<TPreDispatchInfo> {
/**
* 预派单记录简单分页查询
* @param tPreDispatchInfo 预派单记录
* @return
*/
IPage<TPreDispatchInfo> getTPreDispatchInfoPage(Page<TPreDispatchInfo> page, TPreDispatchInfo tPreDispatchInfo);
/**
* 修改资料是否提交状态 0 是 1 否
* @Author huyc
* @Date 2022-07-18
* @param ids
* @param status
* @return
**/
R<Boolean> modifyDataSubmitStatus(String ids, String status);
/**
* 清空预派单默认的派单合同信息
* @Author huyc
* @Date 2022-07-18
* @param ids
* @return
**/
R<Boolean> clearContractInfo(String ids);
/**
* 更新预派单是否派单状态
* @Author huyc
* @Date 2022-07-18
* @param id
* @param dispatchFlag
* @param cancelRemark
* @return
**/
R<Boolean> updateDispatchFlag(String id, String dispatchFlag, String cancelRemark);
/**
* 单个派单
* @Author huyc
* @Date 2022-07-18
* @param id
* @return
**/
R<Boolean> dispatchById(String id);
/**
* 修改预派单记录
* @Author huyc
* @Date 2022-07-18
* @return
**/
R update(TPreDispatchInfo tPreDispatchInfo);
}
/*
* 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.yifu.social.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yifu.cloud.plus.v1.yifu.social.entity.TPaymentInfo;
import com.yifu.cloud.plus.v1.yifu.social.mapper.TPaymentInfoMapper;
import com.yifu.cloud.plus.v1.yifu.social.service.TPaymentInfoService;
import org.springframework.stereotype.Service;
/**
* 缴费库
*
* @author huyc
* @date 2022-07-14 18:53:42
*/
@Service
public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPaymentInfo> implements TPaymentInfoService {
/**
* 缴费库简单分页查询
* @param tPaymentInfo 缴费库
* @return
*/
@Override
public IPage<TPaymentInfo> getTPaymentInfoPage(Page<TPaymentInfo> page, TPaymentInfo tPaymentInfo){
return baseMapper.getTPaymentInfoPage(page,tPaymentInfo);
}
}
......@@ -82,6 +82,10 @@
<result property="createTime" column="CREATE_TIME"/>
<result property="updateTime" column="UPDATE_TIME"/>
</resultMap>
<sql id="base_column_list">
SELECT
a.*
</sql>
<sql id="Base_Column_List">
a.ID,
a.PROVINCE,
......@@ -330,4 +334,13 @@
</where>
order by a.CREATE_TIME desc
</select>
<!--sysBaseSetInfo简单查询-->
<select id="getAllByEntity" resultMap="sysBaseSetInfoMap">
<include refid="base_column_list"/>
FROM sys_base_set_info a
<where>
1=1
<include refid="sysBaseSetInfo_where"/>
</where>
</select>
</mapper>
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