Merge remote-tracking branch 'remotes/origin/dev' into test

yun-zuoyi
汪云昊 5 years ago
commit b38e6ea1ad

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -135,38 +135,46 @@ public class UserExportModel extends BaseBean {
}
public UserExportModel setSysUser(SysUser sysUser){
this.userLoginName=sysUser.getUserLoginName();
this.userPhone=sysUser.getUserPhone();
this.userEmail=sysUser.getUserEmail();
this.infoEmpNo=sysUser.getUserEmpNo();
if (sysUser != null) {
this.userLoginName = sysUser.getUserLoginName();
this.userPhone = sysUser.getUserPhone();
this.userEmail = sysUser.getUserEmail();
this.infoEmpNo = sysUser.getUserEmpNo();
} else {
this.userLoginName = "用户账号不存在";
}
return this;
}
public UserExportModel setSysUserInfo(SysUserInfo sysUserInfo){
this.infoName=sysUserInfo.getName();
this.departmentNameRdd=sysUserInfo.getDepartmentNameRdd();
this.positionNameRdd=sysUserInfo.getPositionNameRdd();
this.organizeNameRdd=sysUserInfo.getOrganizeNameRdd();
this.infoEmployeeType=sysUserInfo.getUserEmployeeType();
this.infoGrade=sysUserInfo.getUserGrade();
this.infoSex=sysUserInfo.getUserSex();
this.infoMarriage=sysUserInfo.getUserMarriage();
this.infoCardType=sysUserInfo.getUserCardType();
this.infoCardNumber=sysUserInfo.getUserCardNumber();
this.infoSchoolProfession=sysUserInfo.getUserSchoolProfession();
this.infoSchool=sysUserInfo.getUserSchool();
this.infoSchoolEducation=sysUserInfo.getUserSchoolEducation();
this.infoSchoolLeaveDate=sysUserInfo.getUserSchoolLeaveDate();
this.infoBirthplace=sysUserInfo.getUserBirthplace();
this.infoRace=sysUserInfo.getUserRace();
this.infoEmergencyContact=sysUserInfo.getUserEmergencyContact();
this.infoEmergencyPhone=sysUserInfo.getUserEmergencyPhone();
this.infoJoinDate=sysUserInfo.getUserJoinDate();
this.infoResignationDate=sysUserInfo.getUserResignationDate();
this.infoBornDate=sysUserInfo.getUserBornDate();
this.infoPoliticalStatus=sysUserInfo.getUserPoliticalStatus();
this.infoHobby=sysUserInfo.getUserHobby();
this.infoFamilyAddress=sysUserInfo.getUserFamilyAddress();
if (sysUserInfo != null) {
this.infoName = sysUserInfo.getName();
this.departmentNameRdd = sysUserInfo.getDepartmentNameRdd();
this.positionNameRdd = sysUserInfo.getPositionNameRdd();
this.organizeNameRdd = sysUserInfo.getOrganizeNameRdd();
this.infoEmployeeType = sysUserInfo.getUserEmployeeType();
this.infoGrade = sysUserInfo.getUserGrade();
this.infoSex = sysUserInfo.getUserSex();
this.infoMarriage = sysUserInfo.getUserMarriage();
this.infoCardType = sysUserInfo.getUserCardType();
this.infoCardNumber = sysUserInfo.getUserCardNumber();
this.infoSchoolProfession = sysUserInfo.getUserSchoolProfession();
this.infoSchool = sysUserInfo.getUserSchool();
this.infoSchoolEducation = sysUserInfo.getUserSchoolEducation();
this.infoSchoolLeaveDate = sysUserInfo.getUserSchoolLeaveDate();
this.infoBirthplace = sysUserInfo.getUserBirthplace();
this.infoRace = sysUserInfo.getUserRace();
this.infoEmergencyContact = sysUserInfo.getUserEmergencyContact();
this.infoEmergencyPhone = sysUserInfo.getUserEmergencyPhone();
this.infoJoinDate = sysUserInfo.getUserJoinDate();
this.infoResignationDate = sysUserInfo.getUserResignationDate();
this.infoBornDate = sysUserInfo.getUserBornDate();
this.infoPoliticalStatus = sysUserInfo.getUserPoliticalStatus();
this.infoHobby = sysUserInfo.getUserHobby();
this.infoFamilyAddress = sysUserInfo.getUserFamilyAddress();
} else {
this.infoName = "用户消息不存在";
}
return this;
}
}

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -0,0 +1,78 @@
package cn.estsh.i3plus.pojo.platform.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import com.alibaba.fastjson.JSON;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2020-09-13 17:35
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="SYS_SOFT_UPDATE_RECORD")
@ApiModel(value="软件更新记录",description = "软件更新记录")
public class SysSoftUpdateRecord extends BaseBean {
@Column(name="SYSTEM_SOFT_TYPE")
@ApiParam(value ="系统软件类型")
private Integer systemSoftType;
public String getSystemSoftTypeTxt(){
return systemSoftType == null ? "无" : CommonEnumUtil.SOFT_TYPE.valueOfDescription(systemSoftType);
}
@Column(name="SYSTEM_VERSION")
@ApiParam(value ="系统版本")
private String systemVersion;
@Lob
@Column(name="UPDATE_CONTENT")
@ApiParam(value ="更新内容")
private String updateContent;
@Column(name="FIRST_DEPLOYMENT_TIME")
@ApiParam(value ="首次部署时间")
private String firstDeploymentTime;
@Transient
private Map<String, List<String>> updateDetailMap;
public void putUpdateDetail(String detailType, String detail) {
if(updateDetailMap == null){
updateDetailMap = new HashMap<>();
}
List<String> detailList;
if (updateDetailMap.containsKey(detailType)) {
detailList = updateDetailMap.get(detailType);
} else {
detailList = new ArrayList<>();
updateDetailMap.put(detailType, detailList);
}
detailList.add(detail);
}
public void transformUpdateDetail() {
this.updateContent = JSON.toJSONString(updateDetailMap);
}
}

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.platform.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.platform.bean.SysSoftUpdateRecord;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2020-09-14 13:15
* @Modify:
**/
public interface SysSoftUpdateRecordRepository extends BaseRepository<SysSoftUpdateRecord, Long> {
}

@ -2,6 +2,10 @@ package cn.estsh.i3plus.pojo.platform.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.platform.bean.SysToolType;
import org.springframework.data.jpa.repository.Lock;
import org.springframework.data.jpa.repository.Query;
import javax.persistence.LockModeType;
/**
* @Description :
@ -11,4 +15,9 @@ import cn.estsh.i3plus.pojo.platform.bean.SysToolType;
* @Modify :
**/
public interface SysToolTypeRepository extends BaseRepository<SysToolType, Long> {
@Lock(LockModeType.PESSIMISTIC_WRITE)
@Query(value = "from SysToolType where id = ?1")
SysToolType getByIds(Long id);
}

@ -1210,4 +1210,26 @@ public class CoreHqlPack {
return ddlPackBean;
}
public static DdlPackBean packHqlQuerySysSoftUpdateRecord(SysSoftUpdateRecord sysSoftUpdateRecord){
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysSoftUpdateRecord);
DdlPreparedPack.getNumEqualPack(sysSoftUpdateRecord.getSystemSoftType(), "systemSoftType", ddlPackBean);
DdlPreparedPack.getStringEqualPack(sysSoftUpdateRecord.getSystemVersion(), "systemVersion", ddlPackBean);
DdlPreparedPack.timeBuilder(sysSoftUpdateRecord.getFirstDeploymentTime(), "firstDeploymentTime", ddlPackBean, false,
true);
return ddlPackBean;
}
public static DdlPackBean packHqlCheckSysSoftUpdateRecordOnly(SysSoftUpdateRecord sysSoftUpdateRecord){
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysSoftUpdateRecord);
DdlPreparedPack.getNumNOEqualPack(sysSoftUpdateRecord.getId(), "id", ddlPackBean);
DdlPreparedPack.getNumEqualPack(sysSoftUpdateRecord.getSystemSoftType(), "systemSoftType", ddlPackBean);
DdlPreparedPack.getStringEqualPack(sysSoftUpdateRecord.getSystemVersion(), "systemVersion", ddlPackBean);
return ddlPackBean;
}
}

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -39,11 +39,18 @@ public class WmsAutoPurchasePartModel extends Pager {
@ApiParam("供应商名称")
private String vendorName;
public WmsAutoPurchasePartModel(String partNo, String partName, Integer qty, String warehouse) {
@ApiParam("要货时间")
private String arriveTime;
private Integer preReceivingDay;
public WmsAutoPurchasePartModel(String partNo, String partName, Integer qty, String warehouse, Integer preReceivingDay) {
this.partNo = partNo;
this.partName = partName;
this.qty = qty;
this.erpWarehouse = warehouse;
this.preReceivingDay = preReceivingDay;
}
public WmsAutoPurchasePartModel() {

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -15,7 +15,7 @@
<groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo</artifactId>
<packaging>pom</packaging>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<modules>
<module>modules/i3plus-pojo-base</module>
<module>modules/i3plus-pojo-platform</module>

@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo
# defaults to project key
sonar.projectName=i3plus-pojo
# defaults to 'not provided'
sonar.projectVersion=1.0-TEST-SNAPSHOT
sonar.projectVersion=1.0-DEV-SNAPSHOT
# Path is relative to the sonar-project.properties file. Defaults to .
#sonar.sources=./

Loading…
Cancel
Save