出口贸易和学校修改

blade-common/src/main/java/org/springblade/common/utils/NumToWords.java

@@ -8,11 +8,11 @@ public class NumToWords {
 		System.out.println(NumToWords.parse("11232192.23123"));
 	}
 	//10以内的数字
-	private static final String[] SINGLE_NUM_ARR = new String[] { "", "One", "Two", "Three", "Four", "Five", "Six", "Seven", "Eight", "Nine" };
+	private static final String[] SINGLE_NUM_ARR = new String[] { "", "ONE", "TWO", "THREE", "FOUR", "FIVE", "SIX", "SEVEN", "EIGHT", "NINE" };
 	//十几的数字
-	private static final String[] TEN_NUM_ARR = new String[] { "Ten", "Eleven", "Tweleve", "Thirteen", "Fourteen", "Fifteen", "Sixteen","Seventeen", "Eighteen", "Nineteen" };
+	private static final String[] TEN_NUM_ARR = new String[] { "TEN", "ELEVEN", "TWELEVE", "THIRTEEN", "FOURTEEN", "FIFTEEN", "SIXTEEN","SEVENTEEN", "EIGNTEEN", "NINRTEEN" };
 	//整十的数字
-	private static final String[] TEN_INTEGER_ARR = new String[] { "Ten", "Twenty", "Thirty", "Forty", "Fifty", "Sixty", "Seventy", "Eighty", "Ninety" };
+	private static final String[] TEN_INTEGER_ARR = new String[] { "TEN", "TWENTY", "THIRTY", "FORTY", "FIFTY", "SIXTY", "SEVENTY", "EIGHTY", "NINETY" };
 
 	public static String parse(String x) {
 		if(Double.parseDouble(x) <= 0){

blade-service-api/blade-client-api/src/main/java/org/springblade/client/feign/ICorpsDescClient.java

@@ -35,6 +35,7 @@ public interface ICorpsDescClient {
 	String CORPS_UPDATE= API_PREFIX + "/update";
 	String GET_COUNT= API_PREFIX + "/count";
 	String GET_FLEET_ID= API_PREFIX + "/getFleetId";
+	String GET_GOOD_TYPE_MESSAGE = API_PREFIX + "getGoodTypeMessage";
 
 
 
@@ -104,5 +105,12 @@ public interface ICorpsDescClient {
 
 	@GetMapping(GET_COUNT)
 	int getCount();
+	/**
+	 * 获取商品类别及其子类别
+	 * @param goodTypeId 商品类别
+	 * @return
+	 */
+	@GetMapping(GET_GOOD_TYPE_MESSAGE)
+	List<Long> getGoodTypeMessage(@RequestParam("goodTypeId") Long goodTypeId);
 
 }

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

@@ -835,4 +835,12 @@ public class SalaryItem implements Serializable {
 	 */
 	@ApiModelProperty(value = "备注3")
 	private String remarksOne;
+
+	public BigDecimal getfSalary() {
+		return fSalary;
+	}
+
+	public void setfSalary(BigDecimal fSalary) {
+		this.fSalary = fSalary;
+	}
 }

blade-service/blade-client/src/main/java/org/springblade/client/corps/feign/CorpsDescClient.java

@@ -11,6 +11,7 @@ import org.springblade.client.corps.service.ICorpsDescService;
 import org.springblade.client.entity.CorpsBank;
 import org.springblade.client.entity.CorpsDesc;
 import org.springblade.client.feign.ICorpsDescClient;
+import org.springblade.client.goods.service.IGoodsTypeService;
 import org.springblade.client.vo.CorpsDescVO;
 import org.springblade.core.mp.support.BladePage;
 import org.springblade.core.mp.support.Condition;
@@ -39,6 +40,7 @@ public class CorpsDescClient implements ICorpsDescClient {
 
 	private final ICorpsBankService bankService;
 
+	private final IGoodsTypeService goodsTypeService;
 
 	@Override
 	@PostMapping(CORPS_UPDATE)
@@ -140,4 +142,9 @@ public class CorpsDescClient implements ICorpsDescClient {
 			.eq(CorpsDesc::getIsDeleted, 0));
 	}
 
+	@Override
+	public List<Long> getGoodTypeMessage(Long goodTypeId) {
+		return goodsTypeService.goodTypeIdList(goodTypeId.toString());
+	}
+
 }

blade-service/blade-client/src/main/java/org/springblade/client/goods/service/IGoodsTypeService.java

@@ -82,4 +82,11 @@ public interface IGoodsTypeService extends IService<GoodsType> {
 	 */
 	void selectGoodsTypeCname(GoodsType goodsType);
 
+	/**
+	 * 根据商品类别获取商品的子类别
+	 * @param goodTypeId 商品类别id
+	 * @return
+	 */
+	List<Long> goodTypeIdList(String goodTypeId);
+
 }

blade-service/blade-client/src/main/java/org/springblade/client/parities/controller/ParitiesController.java

@@ -42,6 +42,10 @@ import org.springblade.client.parities.vo.ParitiesVO;
 import org.springblade.client.parities.service.IParitiesService;
 import org.springblade.core.boot.ctrl.BladeController;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * 汇率管理主表 控制器
  *
@@ -206,6 +210,21 @@ public class ParitiesController extends BladeController {
 		}
 		return R.data(paritiesService.getParities(parities));
 	}
+	/**
+	 * 业务获取币别
+	 */
+	@GetMapping("/getCode")
+	@ApiOperationSupport(order = 10)
+	@ApiOperation(value = "业务获取币别", notes = "传入parities")
+	public R<List<String>> getCode(Parities parities) {
+		parities.setTenantId(SecureUtil.getTenantId());
+		List<Parities> paritiesList = paritiesService.list(Condition.getQueryWrapper(parities));
+		List<String> list = new ArrayList<>();
+		if (CollectionUtils.isNotEmpty(paritiesList)){
+			list = paritiesList.stream().filter(e -> StringUtils.isNotBlank(e.getCode())).map(Parities::getCode).collect(Collectors.toList());
+		}
+		return R.data(list);
+	}
 
 
 }

blade-service/blade-client/src/main/java/org/springblade/client/parities/service/impl/ParitiesServiceImpl.java

@@ -88,7 +88,7 @@ public class ParitiesServiceImpl extends ServiceImpl<ParitiesMapper, Parities> i
 		Calendar calendar = Calendar.getInstance();
 		calendar.setTime(paritiesVO.getBusinesDate());
 		int year = calendar.get(Calendar.YEAR);//处理业务日期获取年
-		int month = calendar.get(Calendar.MONTH);//处理业务日期获取月
+		int month = calendar.get(Calendar.MONTH) + 1;//处理业务日期获取月
 		int date = calendar.get(Calendar.DATE);//处理业务日期获取日
 		//获取汇率类型
 		LambdaQueryWrapper<Parities> queryWrapper = new LambdaQueryWrapper<>();

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/controller/PriceBankController.java

@@ -28,6 +28,7 @@ import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 
 import org.springblade.client.entity.CorpsDesc;
+import org.springblade.client.entity.GoodsDesc;
 import org.springblade.client.feign.ICorpsDescClient;
 import org.springblade.client.feign.IGoodsDescClient;
 import org.springblade.client.vo.GoodsDescVO;
@@ -125,6 +126,12 @@ public class PriceBankController extends BladeController {
 	@ApiOperation(value = "分页", notes = "传入priceBank")
 	public R<IPage<PriceBank>> page(PriceBankVO priceBank, Query query) {
 		LambdaQueryWrapper<PriceBank> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		if (priceBank.getGoodTypeId() != null) {
+			List<Long> goodTypeMessage = corpsDescClient.getGoodTypeMessage(priceBank.getGoodTypeId());
+			if (CollectionUtils.isNotEmpty(goodTypeMessage)){
+				lambdaQueryWrapper.in(PriceBank::getGoodTypeId, goodTypeMessage);
+			}
+		}
 		lambdaQueryWrapper.eq(PriceBank::getIsDeleted,0);
 		lambdaQueryWrapper.eq(PriceBank::getStatus,0);
 		lambdaQueryWrapper.eq(PriceBank::getTenantId, SecureUtil.getTenantId());

blade-service/blade-school/src/main/java/org/springblade/school/controller/SalaryItemController.java

@@ -1460,9 +1460,9 @@ public class SalaryItemController extends BladeController {
 	@GetMapping("/salaryStatements")
 	@ApiOperationSupport(order = 80)
 	@ApiOperation(value = "报表分析-工资明细-列表", notes = "传入salaryItem")
-	public R<IPage<SalaryItem>> salaryStatements(SalaryItemVO salaryItem, Query query) {
+	public R<IPage<WageExcel>> salaryStatements(SalaryItemVO salaryItem, Query query) {
 		salaryItem.setTenantId(SecureUtil.getTenantId());
-		IPage<SalaryItem> pages = salaryItemService.salaryStatements(Condition.getPage(query), salaryItem);
+		IPage<WageExcel> pages = salaryItemService.salaryStatements(Condition.getPage(query), salaryItem);
 		return R.data(pages);
 	}
 	/**

blade-service/blade-school/src/main/java/org/springblade/school/excel/WageExcel.java

@@ -135,6 +135,11 @@ public class WageExcel implements Serializable {
 	@ExcelProperty(value = "工作量工资标准")
 	private BigDecimal workloadSalaryCritertion;
 	/**
+	 * 虚拟工作量工资标准
+	 */
+	@ExcelProperty(value = "虚拟工作量工资标准")
+	private BigDecimal virtualWorkloadSalary;
+	/**
 	 * 月份工作量
 	 */
 	@ExcelProperty(value = "月份工作量")
@@ -638,7 +643,7 @@ public class WageExcel implements Serializable {
 	 * 实发工资
 	 */
 	@ExcelProperty(value = "实发工资")
-	private BigDecimal wage;
+	private BigDecimal fSalary;
 	/**
 	 * 实发工资取整
 	 */
@@ -664,4 +669,12 @@ public class WageExcel implements Serializable {
 	 */
 	@ExcelProperty(value = "备注3")
 	private String remarksOne;
+
+	public BigDecimal getfSalary() {
+		return fSalary;
+	}
+
+	public void setfSalary(BigDecimal fSalary) {
+		this.fSalary = fSalary;
+	}
 }

blade-service/blade-school/src/main/java/org/springblade/school/mapper/SalaryItemMapper.java

@@ -62,7 +62,7 @@ public interface SalaryItemMapper extends BaseMapper<SalaryItem> {
 	 * @param salaryItem
 	 * @return
 	 */
-	List<SalaryItem> salaryStatements(IPage page,@Param("salaryItem") SalaryItemVO salaryItem);
+	List<WageExcel> salaryStatements(IPage page,@Param("salaryItem") SalaryItemVO salaryItem);
 	/**
 	 * 报表分析 获取工资明细
 	 * @param salaryItem

blade-service/blade-school/src/main/java/org/springblade/school/mapper/SalaryItemMapper.xml

@@ -144,17 +144,17 @@
         update school_salary_item set status = #{status} where pid = #{pid} and is_deleted = 0
     </update>
     <select id="exportSupplierTemplate" resultType="org.springblade.school.excel.WageExcel">
-        select *,f_salary AS wage from school_salary_item where is_deleted = 0 and pid = #{salaryItem.pid} and tenant_id = #{salaryItem.tenantId}
+        select * from school_salary_item where is_deleted = 0 and pid = #{salaryItem.pid} and tenant_id = #{salaryItem.tenantId}
     </select>
-    <select id="salaryStatements" resultMap="salaryItemResultMap">
+    <select id="salaryStatements" resultType="org.springblade.school.excel.WageExcel">
         SELECT
-	    si.*
+        si.*
         FROM
-	        school_salary_item si
-	    LEFT JOIN school_salary sa ON si.pid = sa.id
+        school_salary_item si
+        LEFT JOIN school_salary sa ON si.pid = sa.id
         WHERE
-	    si.is_deleted = 0
-	    AND sa.is_deleted = 0
+        si.is_deleted = 0
+        AND sa.is_deleted = 0
         <if test="salaryItem.cname!=null and salaryItem.cname != ''">
             and si.cname like CONCAT(CONCAT('%', #{salaryItem.cname}), '%')
         </if>
@@ -182,8 +182,7 @@
     </select>
     <select id="exportSalaryStatements" resultType="org.springblade.school.excel.WageExcel">
         SELECT
-        si.*,
-        si.f_salary AS wage
+        si.*
         FROM
         school_salary_item si
         LEFT JOIN school_salary sa ON si.pid = sa.id

blade-service/blade-school/src/main/java/org/springblade/school/service/ISalaryItemService.java

@@ -324,7 +324,7 @@ public interface ISalaryItemService extends IService<SalaryItem> {
 	 * @param salaryItem
 	 * @return
 	 */
-	IPage<SalaryItem> salaryStatements(IPage<SalaryItem> page, SalaryItemVO salaryItem);
+	IPage<WageExcel> salaryStatements(IPage<WageExcel> page, SalaryItemVO salaryItem);
 	/**
 	 * 导出工资明细
 	 * @param salaryItem

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

@@ -1935,7 +1935,7 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 	}
 
 	@Override
-	public IPage<SalaryItem> salaryStatements(IPage<SalaryItem> page, SalaryItemVO salaryItem) {
+	public IPage<WageExcel> salaryStatements(IPage<WageExcel> page, SalaryItemVO salaryItem) {
 		return page.setRecords(baseMapper.salaryStatements(page,salaryItem));
 	}
 	@Override
@@ -1967,7 +1967,7 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 			item.setCustomTwo(item.getCustom().multiply(item.getCustomOne()));//代课工作量工资
 			item.setOvertimeAtWeekend(item.getCustomizeNine().multiply(item.getRibbon()));//周末工作量工资
 			item.setBasicsSalary(item.getSchoolAgeSalary().add(item.getCapitalIncrease()).add(item.getEducationSalary()).add(item.getRankSalary()).add(item.getSalaryBase()));//基础工资
-			item.setWorkloadSalary(item.getMomthWorkloadSalary().add(item.getDoubleMoney()).add(item.getCustomTwo()).add(item.getCustomThree()).add(item.getCustomFour()).add(item.getCustomFive()).add(item.getCustomSix()).add(item.getCustomSeven()));//工作量工资
+			item.setWorkloadSalary(item.getMomthWorkloadSalary().add(item.getDoubleMoney()).add(item.getCustomTwo()).add(item.getCustomThree()).add(item.getCustomFour()).add(item.getCustomFive()).add(item.getCustomSix()).add(item.getCustomSeven()).subtract(item.getVirtualWorkloadSalary()));//工作量工资
 			item.setAwardSalary(item.getCustomAward().add(item.getCustomAwardOne()).add(item.getCustomAwardTwo()).add(item.getCustomAwardThree()).add(item.getCustomAwardFour()).add(item.getCustomAwardFive()).add(item.getCustomAwardSix()).add(item.getCustomAwardSeven()).add(item.getCustomAwardEight()).add(item.getCustomAwardNine()));//奖励工资
 			item.setDutyAllowances(item.getLeadingCadreSubsidy().add(item.getCustomizeFive()).add(item.getPrepareLessons()).add(item.getCustomizeSix()).add(item.getTeachingResearch()).add(item.getCustomizeSeven()));//职务津贴
 			item.setClassTeacherSubsidy(item.getClassTeacherFee().add(item.getClasses()).subtract(item.getAdjustTheBalance()).subtract(item.getPayrollCredit()).subtract(item.getPaid()).add(item.getCustomizeEight()));//班主任津贴
@@ -1983,7 +1983,8 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 				item.setSalary(item.getBasicsSalary().add(item.getWorkloadSalary()).add(item.getDailyAssessmentSalary()).add(item.getAwardSalary()).add(item.getDutyAllowances()).add(item.getClassTeacherSubsidy()).add(item.getSubsidy()).subtract(item.getDeductions()).add(item.getInsurancePersonage()).add(item.getReservedFundsPersonage()));
 			}
 			//实发工资
-			item.setFSalary(item.getSalary().subtract(item.getPersonageTaxes()).subtract(item.getInsurancePersonage()).subtract(item.getReservedFundsPersonage()));
+			item.setfSalary(item.getSalary().subtract(item.getPersonageTaxes()).subtract(item.getInsurancePersonage()).subtract(item.getReservedFundsPersonage()));
+			item.setPauseNoPayOne(item.getfSalary().setScale(0, BigDecimal.ROUND_HALF_UP));
 			baseMapper.updateById(item);
 		}
 	}

blade-service/trade-purchase/src/main/java/com/trade/purchase/enquiry/ShippingEnquiry.java

@@ -95,6 +95,7 @@ public class ShippingEnquiry extends BladeController {
 		lambdaQueryWrapper.eq(Order::getIsDeleted, 0);//订单是否有效
 		lambdaQueryWrapper.eq(Order::getBillType, OrderTypeEnum.ENQUIRY.getType());//订单类型
 		lambdaQueryWrapper.eq(Order::getTradeType, OrderTypeEnum.EXPORT.getType());//贸易类型
+		lambdaQueryWrapper.and(i ->i.eq(Order::getIfShipping,"已提交").or().eq(Order::getIfShipping,"船务确认"));//船务询价
 		lambdaQueryWrapper.like(Func.isNotEmpty(order.getOrderNo()), Order::getOrderNo, order.getOrderNo());//订单号
 		lambdaQueryWrapper.like(Func.isNotEmpty(order.getCorpId()), Order::getCorpId, order.getCorpId());//客户id
 		lambdaQueryWrapper.eq(Func.isNotEmpty(order.getStorageId()), Order::getStorageId, order.getStorageId());//仓库id
@@ -181,7 +182,7 @@ public class ShippingEnquiry extends BladeController {
 			return R.fail(ERROR_MSG);
 		}
 		Order orderMessage = orderService.getById(order.getId());
-		if (orderMessage != null && !orderMessage.getIfShipping().equals("无")){
+		if (orderMessage != null && !orderMessage.getIfShipping().equals("录入")){
 			return R.fail(500,"已提交船务询价,请勿重复提交");
 		}
 		order.setIfShipping("已提交");