2022年12月2 18:34

blade-service-api/blade-box-tube-api/src/main/java/org/springblade/box/tube/entity/DeclareCustoms.java

@@ -125,7 +125,7 @@ public class DeclareCustoms implements Serializable {
 	 * 申报状态
 	 */
 	@ApiModelProperty(value = "申报状态")
-	private Integer declareStatus;
+	private String declareStatus;
 
 	/**
 	 * 审核状态
@@ -404,16 +404,28 @@ public class DeclareCustoms implements Serializable {
 	private BigDecimal netWeight;
 
 	/**
-	 * 启运国
+	 * 启运国名称
 	 */
-	@ApiModelProperty(value = "启运国")
-	private String countryOrigin;
+	@ApiModelProperty(value = "启运国名称")
+	private String countryOriginName;
 
 	/**
-	 * 经停港
+	 * 启运国id
 	 */
-	@ApiModelProperty(value = "经停港")
-	private String stopOverHarbor;
+	@ApiModelProperty(value = "启运国id")
+	private Long countryOriginId;
+
+	/**
+	 * 经停港名称
+	 */
+	@ApiModelProperty(value = "经停港名称")
+	private String stopOverHarborName;
+
+	/**
+	 * 经停港id
+	 */
+	@ApiModelProperty(value = "经停港id")
+	private Long stopOverHarborId;
 
 	/**
 	 * 成交方式
@@ -422,10 +434,16 @@ public class DeclareCustoms implements Serializable {
 	private String transactionMode;
 
 	/**
-	 * 贸易国别
+	 * 贸易国别名称
 	 */
-	@ApiModelProperty(value = "贸易国别")
-	private String tradeCountry;
+	@ApiModelProperty(value = "贸易国别名称")
+	private String tradeCountryName;
+
+	/**
+	 * 贸易国别id
+	 */
+	@ApiModelProperty(value = "贸易国别id")
+	private Long tradeCountryId;
 
 	/**
 	 * 集装箱数
@@ -440,10 +458,16 @@ public class DeclareCustoms implements Serializable {
 	private BigDecimal documentsAttached;
 
 	/**
-	 * 入境口岸
+	 * 入境口岸名称
+	 */
+	@ApiModelProperty(value = "入境口岸名称")
+	private String portEntryName;
+
+	/**
+	 * 入境口岸id
 	 */
-	@ApiModelProperty(value = "入境口岸")
-	private String portEntry;
+	@ApiModelProperty(value = "入境口岸id")
+	private Long portEntryId;
 
 	/**
 	 * 货物存放地点
@@ -452,10 +476,16 @@ public class DeclareCustoms implements Serializable {
 	private String storagePlaceGoods;
 
 	/**
-	 * 启运港
+	 * 启运港名称
+	 */
+	@ApiModelProperty(value = "启运港名称")
+	private String portDepartureName;
+
+	/**
+	 * 启运港id
 	 */
-	@ApiModelProperty(value = "启运港")
-	private String portDeparture;
+	@ApiModelProperty(value = "启运港id")
+	private Long portDepartureId;
 
 	/**
 	 * 报关单类型

blade-service-api/blade-box-tube-api/src/main/java/org/springblade/box/tube/entity/DeclareCustomsFees.java

@@ -95,6 +95,12 @@ public class DeclareCustomsFees implements Serializable {
 	private Long itemId;
 
 	/**
+	 * 费用名称
+	 */
+	@ApiModelProperty(value = "费用名称")
+	private String itemName;
+
+	/**
 	 * 排序
 	 */
 	@ApiModelProperty(value = "排序")
@@ -167,6 +173,12 @@ public class DeclareCustomsFees implements Serializable {
 	private Long corpId;
 
 	/**
+	 * 客户名称
+	 */
+	@ApiModelProperty(value = "客户名称")
+	private String corpName;
+
+	/**
 	 * 生成贷款
 	 */
 	@ApiModelProperty(value = "生成贷款")

blade-service-api/blade-box-tube-api/src/main/java/org/springblade/box/tube/entity/DeclareCustomsItem.java

@@ -179,10 +179,16 @@ public class DeclareCustomsItem implements Serializable {
 	private String articleNo;
 
 	/**
-	 * 最终目的国(地区)
+	 * 最终目的国名称(地区)
 	 */
-	@ApiModelProperty(value = "最终目的国(地区)")
-	private String finalDestinationCountry;
+	@ApiModelProperty(value = "最终目的国名称(地区)")
+	private String finalDestinationCountryName;
+
+	/**
+	 * 最终目的国id(地区)
+	 */
+	@ApiModelProperty(value = "最终目的国id(地区)")
+	private Long finalDestinationCountryId;
 
 	/**
 	 * 法定第二数量
@@ -197,10 +203,16 @@ public class DeclareCustomsItem implements Serializable {
 	private String legalSecondMeasurement;
 
 	/**
-	 * 原产国
+	 * 原产国名称
+	 */
+	@ApiModelProperty(value = "原产国名称")
+	private String originatedCountriesName;
+
+	/**
+	 * 原产国id
 	 */
-	@ApiModelProperty(value = "原产国")
-	private String originatedCountries;
+	@ApiModelProperty(value = "原产国id")
+	private Long originatedCountriesId;
 
 	/**
 	 * 原产地区

blade-service-api/blade-client-api/src/main/java/org/springblade/client/entity/CorpsDesc.java

@@ -425,6 +425,12 @@ public class CorpsDesc implements Serializable {
 	private String corpsTypeName;
 
 	/**
+	 * 海关号
+	 */
+	@ApiModelProperty(value = "海关号")
+	private String customsNo;
+
+	/**
 	 * 排序 0 正序  1 倒序
 	 */
 	@TableField(exist = false)

blade-service-api/blade-school-api/src/main/java/org/springblade/school/entity/SalaryItem.java

@@ -893,7 +893,7 @@ public class SalaryItem implements Serializable {
 	 * 拨付比例
 	 */
 	@ApiModelProperty(value = "拨付比例")
-	private String appropriationProportion;
+	private BigDecimal appropriationProportion;
 
 	/**
 	 * 是否已导入出勤(0 否，1 是)

blade-service/blade-client/src/main/java/org/springblade/client/port/controller/PortController.java

@@ -21,6 +21,7 @@ import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tenant.annotation.NonDS;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.core.tool.utils.StringUtil;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
@@ -191,12 +192,22 @@ public class PortController {
 		QueryWrapper<BasicPortDesc> queryWrapper = new QueryWrapper<BasicPortDesc>().setEntity(basicPortDesc);
 
 		if (StringUtil.isNotBlank(basicPortDesc.getTypeName())) {
-			List<Long> typeIdList = basicPortTypeService.list(new LambdaQueryWrapper<BasicPortType>()
-				.select(BasicPortType::getId)
-				.eq(BasicPortType::getName, basicPortDesc)
+			LambdaQueryWrapper<BasicPortType> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+			lambdaQueryWrapper.select(BasicPortType::getId)
 				.eq(BasicPortType::getTenantId, AuthUtil.getTenantId())
-				.eq(BasicPortType::getIsDeleted, 0)
-			).stream().map(BasicPortType::getId).collect(Collectors.toList());
+				.eq(BasicPortType::getIsDeleted, 0);
+
+			if (ObjectUtil.isNotEmpty(basicPortDesc.getTypeName())){
+				lambdaQueryWrapper.eq(BasicPortType::getName, basicPortDesc.getTypeName());
+			}else {
+				lambdaQueryWrapper.eq(BasicPortType::getName, basicPortDesc);
+			}
+
+			List<Long> typeIdList = basicPortTypeService.list(lambdaQueryWrapper).stream().map(BasicPortType::getId).collect(Collectors.toList());
+
+			if (ObjectUtil.isEmpty(typeIdList)){
+				return R.data(new ArrayList<>());
+			}
 
 			List<Long> descIdList = basicPortTypeDescService.list(new LambdaQueryWrapper<BasicPortTypeDesc>()
 				.select(BasicPortTypeDesc::getPortsId)

blade-service/blade-school/src/main/java/org/springblade/school/service/impl/SalaryItemServiceImpl.java

@@ -1074,6 +1074,7 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 			//根据身份证号查询教职工信息是否存在存在更新不存在新增
 			SalaryItem item = baseMapper.selectOne(new QueryWrapper<SalaryItem>().eq("id_number", salaryItem.getIdNumber()).eq("tenant_id", SecureUtil.getTenantId())
 				.eq("is_deleted", 0).eq("pid",id));
+
 			//获取日常考核工资
 			if (zhaPingExcel.getGrading().equals("高中部")){
 				//日常考核工资标准
@@ -1098,6 +1099,10 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 				salaryItem.setUpdateUser(SecureUtil.getUserId());
 				salaryItem.setUpdateTime(new Date());
 				salaryItem.setDailyAssessmentSalary(salaryItem.getDailyAssessmentSalary().subtract(item.getVirtualDailyAssessmentCriteria()));//日常考核工资等于 日常考核工资减去虚拟日常考核工资
+				//拨付比例不为空 日常考核工资*拨付比例
+				if (ObjectUtil.isNotEmpty(item.getAppropriationProportion()) && item.getAppropriationProportion().compareTo(BigDecimal.ZERO) > 0){
+					salaryItem.setDailyAssessmentSalary(salaryItem.getDailyAssessmentSalary().multiply(item.getAppropriationProportion(), MathContext.DECIMAL32).setScale(4,BigDecimal.ROUND_HALF_UP));
+				}
 				baseMapper.updateById(salaryItem);
 				message = ++ message;
 				//更新计算工资
@@ -1565,7 +1570,7 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 				salary.setMatterLeave(BigDecimal.ZERO);//事假
 				salary.setSickLeave(BigDecimal.ZERO);//病假
 				salary.setAbsenteeism(BigDecimal.ZERO);//旷工
-				salary.setAppropriationProportion("");//拨付比例
+				salary.setAppropriationProportion(null);//拨付比例
 				salary.setImportedOrNot(0);//是否已导入出勤
 
 				//工资基数标准=工资拨付标准-职级拨付标准-工作量工资标准+虚拟工作量工资标准-双休日工作量标准+虚拟双休日工作量标准-日常考核工资标准+虚拟日常考核工资标准-学期绩效工资标准
@@ -2484,7 +2489,7 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 					item.setAssessTeachingResearchName(item.getAssessTeachingResearchName().multiply(zeroPointEight));//教研组长考核补贴标准
 					item.setTeacherSubsidy(item.getTeacherSubsidy().multiply(zeroPointEight));//班主任补贴标准
 					item.setTeacherAssessSubsidy(item.getTeacherAssessSubsidy().multiply(zeroPointEight));//班主任考核津贴标准
-					item.setAppropriationProportion("80%");
+					item.setAppropriationProportion(zeroPointEight);
 					item.setSalaryBase(item.getSalaryBaseName());//工资基数
 				}else if (item.getAttendanceType().equals("在校")){//在校
 					BigDecimal absenceDays = item.getRequiredAttendanceDays().subtract(item.getActualAttendanceDays());//缺勤天数 = 应出勤天数-实际出勤天数
@@ -2512,7 +2517,7 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 						item.setTeacherAssessSubsidy(item.getTeacherAssessSubsidy().multiply(allotment));//班主任考核津贴标准
 						item.setSalaryBase(item.getSalaryBaseName());//工资基数
 					}
-					item.setAppropriationProportion(allotment.toString());
+					item.setAppropriationProportion(allotment);
 				}
 				item.setImportedOrNot(1);
 			}