Merge branch 'dev' of http://git.echepei.com/lazhaoqian/bladex into dev

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

@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.util.Date;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -82,6 +83,7 @@ public class SchoolTeacher implements Serializable {
 	* 出生日期
 	*/
 		@ApiModelProperty(value = "出生日期")
+		@JsonFormat(pattern = "yyyy-MM-dd")
 		private Date birthdate;
 	/**
 	* 婚姻状况
@@ -97,6 +99,7 @@ public class SchoolTeacher implements Serializable {
 	* 加入日期
 	*/
 		@ApiModelProperty(value = "加入日期")
+		@JsonFormat(pattern = "yyyy-MM-dd")
 		private Date joiningDate;
 	/**
 	* 健康状况

blade-service-api/blade-mocha-item-api/src/main/java/org/springblade/mocha/entity/PriceBank.java

@@ -63,6 +63,11 @@ public class PriceBank implements Serializable {
 		@ApiModelProperty(value = "商品名称")
 		private String cname;
 	/**
+	 * 商品名称
+	 */
+		@ApiModelProperty(value = "商品名称")
+		private String ename;
+	/**
 	* 规格
 	*/
 		@ApiModelProperty(value = "规格")

blade-service-api/blade-purchase-sales-api/src/main/java/org/springblade/purchase/sales/entity/OrderItems.java

@@ -256,6 +256,12 @@ public class OrderItems implements Serializable {
 	@TableField(exist = false)
 	private String cname;
 	/**
+	 * 英文名称
+	 */
+	@ApiModelProperty(value = "英文名称")
+	@TableField(exist = false)
+	private String ename;
+	/**
 	 * 规格编码
 	 */
 	@ApiModelProperty(value = "规格编码")

blade-service-api/blade-purchase-sales-api/src/main/java/org/springblade/purchase/sales/entity/OrderParts.java

@@ -67,6 +67,11 @@ public class OrderParts implements Serializable {
 		@ApiModelProperty(value = "商品名称")
 		private String goodName;
 	/**
+	 * 英文名称
+	 */
+		@ApiModelProperty(value = "商品英文名称")
+		private String ename;
+	/**
 	* 单价
 	*/
 		@ApiModelProperty(value = "单价")

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

@@ -117,6 +117,18 @@ public class Salary implements Serializable {
 		@ApiModelProperty(value = "工资明细")
 		@TableField(exist = false)
 		private List<SalaryItem> salaryItemList;
+	/**
+	 * 创建人中文名
+	 */
+		@ApiModelProperty(value = "创建人中文名")
+		@TableField(exist = false)
+		private String createUserName;
+	/**
+	 * 修改人中文名
+	 */
+		@ApiModelProperty(value = "修改人中文名")
+		@TableField(exist = false)
+		private String updateUserName;
 
 
 }

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

@@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.util.Date;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
@@ -65,6 +66,7 @@ public class SalaryItem implements Serializable {
 	* 转正时间
 	*/
 		@ApiModelProperty(value = "转正时间")
+		@JsonFormat(pattern = "yyyy-MM-dd")
 		private Date positiveTime;
 	/**
 	* 职务
@@ -82,9 +84,9 @@ public class SalaryItem implements Serializable {
 		@ApiModelProperty(value = "身份证号")
 		private String idNumber;
 	/**
-	* 工资拔付标准
+	* 工资拨付标准
 	*/
-		@ApiModelProperty(value = "工资拔付标准")
+		@ApiModelProperty(value = "工资拨付标准")
 		private BigDecimal salaryWithdrawalStandard;
 	/**
 	* 职级拨付标准

blade-service-api/trade-purchase-api/src/main/java/com/trade/purchase/order/entity/OrderParts.java

@@ -62,6 +62,11 @@ public class OrderParts implements Serializable {
 		@ApiModelProperty(value = "商品名称")
 		private String goodName;
 	/**
+	 * 英文名称
+	 */
+		@ApiModelProperty(value = "商品英文名称")
+		private String ename;
+	/**
 	* 单价
 	*/
 		@ApiModelProperty(value = "单价")

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

@@ -1,6 +1,7 @@
 package org.springblade.client.port.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -61,10 +62,11 @@ public class PortController
 				  @RequestParam(name = "lines", required = false) String lines,
 				  @RequestParam(name = "unCode", required = false) String unCode,
 				  @RequestParam(name = "typeId", required = false) Long typeId,
-				  @RequestParam(name = "status", required = false) String status)
+				  @RequestParam(name = "status", required = false) String status,
+				  @RequestParam(name = "enName",required = false) String enName)
 	{
 		Page<BasicPortDescDTO> page=new Page<>(current,size);
-		IPage<BasicPortDescDTO> iPage = basicPortDescService.listBasicPortDesc(page, name, lines, unCode, status,typeId,AuthUtil.getTenantId());
+		IPage<BasicPortDescDTO> iPage = basicPortDescService.listBasicPortDesc(page, name, lines, unCode, status,typeId,AuthUtil.getTenantId(),enName);
 		return R.data(iPage);
 	}
 
@@ -208,6 +210,13 @@ public class PortController
 		}
 		return result;
 	}
+	@GetMapping("/portList")
+	public R<List<BasicPortDesc>> portList(BasicPortDesc basicPortDesc){
+		basicPortDesc.setIsDeleted(0);
+		basicPortDesc.setTenantId(SecureUtil.getTenantId());
+		return R.data(basicPortDescService.list(new QueryWrapper<BasicPortDesc>().setEntity(basicPortDesc)));
+	}
+
 
 
 }

blade-service/blade-client/src/main/java/org/springblade/client/port/mapper/BasicPortDescMapper.java

@@ -23,7 +23,7 @@ import java.util.List;
 @Mapper
 public interface BasicPortDescMapper extends BaseMapper<BasicPortDesc>
 {
-   IPage<BasicPortDescDTO> listBasicPortDesc(Page<BasicPortDescDTO> page, @Param("portName") String portName, @Param("lines")String lines,@Param("unCode") String unCode,@Param("status") String status,@Param("typeId") Long typeId,@Param("tenantId") String tenantId);
+   IPage<BasicPortDescDTO> listBasicPortDesc(Page<BasicPortDescDTO> page, @Param("portName") String portName, @Param("lines")String lines,@Param("unCode") String unCode,@Param("status") String status,@Param("typeId") Long typeId,@Param("tenantId") String tenantId,@Param("enName") String enName);
 
 	List<PortTypeVO> tree(@Param("tenantId") String tenantId);
 }

blade-service/blade-client/src/main/java/org/springblade/client/port/mapper/BasicPortDescMapper.xml

@@ -47,6 +47,9 @@ WHERE
         <if test="portName != null and portName != ''">
             AND b.`name` LIKE CONCAT('%',#{portName,jdbcType=VARCHAR},'%')
         </if>
+        <if test="enName != null and enName != ''">
+            AND b.`en_name` LIKE CONCAT('%',#{enName,jdbcType=VARCHAR},'%')
+        </if>
         <if test="lines != null and lines != ''">
             AND b.`lines`=#{lines}
         </if>

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

@@ -23,7 +23,7 @@ import java.util.Map;
  */
 public interface BasicPortDescService extends BaseService<BasicPortDesc>
 {
-    IPage<BasicPortDescDTO> listBasicPortDesc(Page<BasicPortDescDTO> page,String portName,String lines,String unCode,String status ,Long typeId,String tenantId);
+    IPage<BasicPortDescDTO> listBasicPortDesc(Page<BasicPortDescDTO> page,String portName,String lines,String unCode,String status ,Long typeId,String tenantId,String enName);
 
     void addBasicPortDesc(BasicPortDescDTO dto);
 

blade-service/blade-client/src/main/java/org/springblade/client/port/service/impl/BasicPortDescServiceImpl.java

@@ -44,9 +44,9 @@ public class BasicPortDescServiceImpl extends BaseServiceImpl<BasicPortDescMappe
    private BasicPortTypeDescMapper basicPortTypeDescMapper;
 
 	@Override
-	public IPage<BasicPortDescDTO> listBasicPortDesc(Page<BasicPortDescDTO> page, String portName, String lines, String unCode, String status,Long typeId,String tenantId)
+	public IPage<BasicPortDescDTO> listBasicPortDesc(Page<BasicPortDescDTO> page, String portName, String lines, String unCode, String status,Long typeId,String tenantId,String enName)
 	{
-		return	basicPortDescMapper.listBasicPortDesc(page,portName,lines,unCode,status,typeId,tenantId);
+		return	basicPortDescMapper.listBasicPortDesc(page,portName,lines,unCode,status,typeId,tenantId,enName);
 	}
 
 	@Override

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/service/impl/DeliveryItemsServiceImpl.java

@@ -232,10 +232,10 @@ public class DeliveryItemsServiceImpl extends ServiceImpl<DeliveryItemsMapper, D
 			}
 		}
 		// todo 溢付款
-		R overpayment = this.updateOverpayment(delivery, collect);
+		/*R overpayment = this.updateOverpayment(delivery, collect);
 		if (!overpayment.isSuccess()){
 			throw new RuntimeException(overpayment.getMsg());
-		}
+		}*/
 		return deliveryItemsList;
 	}
 	/**

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/service/impl/PriceBankServiceImpl.java

@@ -160,6 +160,7 @@ public class PriceBankServiceImpl extends ServiceImpl<PriceBankMapper, PriceBank
 					GoodsDesc goodName = goodsDescClient.getGoodName(item.getCname(), null);
 					if (goodName != null){
 						priceBank.setCname(item.getCname());//商品名
+						priceBank.setEname(goodName.getEname());
 						priceBank.setItemId(goodName.getId());//商品id
 						priceBank.setCode(goodName.getCode());//商品编码
 						priceBank.setSpecs(goodName.getTypeno());//商品中文规格

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/OrderItemsServiceImpl.java

@@ -177,6 +177,7 @@ public class OrderItemsServiceImpl extends ServiceImpl<OrderItemsMapper, OrderIt
 						item.setCname(goodsMessage.getData().getCname());
 						item.setTypeno(goodsMessage.getData().getTypeno());
 						item.setSpecificationAndModel(goodsMessage.getData().getSpecificationAndModel());
+						item.setEname(goodsMessage.getData().getEname());
 					}
 				}
 				//如果是出口贸易获取订单明细的配件信息

blade-service/blade-school/pom.xml

@@ -44,6 +44,12 @@
             <groupId>org.springblade</groupId>
             <artifactId>blade-starter-transaction</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-user-api</artifactId>
+            <version>2.8.2.RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
 

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

@@ -16,6 +16,8 @@
  */
 package org.springblade.school.controller;
 
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -28,6 +30,8 @@ import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.system.user.entity.User;
+import org.springblade.system.user.feign.IUserClient;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.school.entity.Salary;
@@ -48,6 +52,7 @@ import org.springblade.core.boot.ctrl.BladeController;
 public class SalaryController extends BladeController {
 
 	private final ISalaryService salaryService;
+	private final IUserClient userClient;
 
 	/**
 	 * 详情
@@ -70,6 +75,20 @@ public class SalaryController extends BladeController {
 	public R<IPage<Salary>> list(Salary salary, Query query) {
 		salary.setTenantId(SecureUtil.getTenantId());
 		IPage<Salary> pages = salaryService.page(Condition.getPage(query), Condition.getQueryWrapper(salary));
+		if (CollectionUtils.isNotEmpty(pages.getRecords())){
+			pages.getRecords().stream().forEach(item ->{
+				R<User> user = userClient.userInfoById(item.getCreateUser());
+				if (user.isSuccess() && user.getData() != null){
+					item.setCreateUserName(user.getData().getName());
+				}
+				if (item.getUpdateUser() != null){
+					R<User> info = userClient.userInfoById(item.getUpdateUser());
+					if (info.isSuccess() && info.getData() != null){
+						item.setUpdateUserName(info.getData().getName());
+					}
+				}
+			});
+		}
 		return R.data(pages);
 	}
 

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

@@ -76,11 +76,13 @@ 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 (item == null){
+				salaryItem.setPid(id);
 				salaryItem.setTenantId(SecureUtil.getTenantId());
 				salaryItem.setCreateUser(SecureUtil.getUserId());
 				salaryItem.setCreateTime(new Date());
 				baseMapper.insert(salaryItem);
 			}else {
+				salaryItem.setPid(id);
 				salaryItem.setId(item.getId());
 				salaryItem.setUpdateUser(SecureUtil.getUserId());
 				salaryItem.setUpdateTime(new Date());

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

@@ -90,7 +90,7 @@ public class SalaryServiceImpl extends ServiceImpl<SalaryMapper, Salary> impleme
 					salaryItem.setUpdateTime(new Date());
 					salaryItem.setUpdateUser(SecureUtil.getUserId());
 					salaryItem.setTenantId(SecureUtil.getTenantId());
-					salaryItemMapper.insert(salaryItem);
+					salaryItemMapper.updateById(salaryItem);
 				}
 			}
 		}