FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop_master' into FOTON

Browse Source 
# Conflicts:
#	adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java
This commit is contained in:
super_liu
2021-12-18 13:59:23 +08:00
parent efe197eb12 545e5bba72
commit 56212b7beb
9 changed files with 92 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java
+3
View File
@@ -70,6 +70,9 @@ public class EsRevisePlan extends BasePage {
@ApiModelProperty(value = "起草责任单位")
private String unit;
@ApiModelProperty(value = "起草责任单位ID")
private String unitName;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java
+19 -19
View File
@@ -86,25 +86,25 @@ public class LawsDto {
@ApiModelProperty(value = "适用产品线")
private String SYCPX;
@ColumnWidth(20)
@ExcelProperty(value = "乘用车VPPS编码", index = 10)
@ApiModelProperty(value = "乘用车VPPS编码")
private String CYCVPPSBM;
@ColumnWidth(20)
@ExcelProperty(value = "乘用车vpps中文名称", index = 11)
@ApiModelProperty(value = "乘用车vpps中文名称")
private String CYCVPPSCN;
@ColumnWidth(20)
@ExcelProperty(value = "卡车VPPS编码", index = 12)
@ApiModelProperty(value = "卡车VPPS编码")
private String KCCVPPSBM;
@ColumnWidth(20)
@ExcelProperty(value = "卡车vpps中文名称", index = 13)
@ApiModelProperty(value = "卡车vpps中文名称")
private String KCCVPPSCN;
// @ColumnWidth(20)
// @ExcelProperty(value = "乘用车VPPS编码", index = 10)
// @ApiModelProperty(value = "乘用车VPPS编码")
// private String CYCVPPSBM;
//
// @ColumnWidth(20)
// @ExcelProperty(value = "乘用车vpps中文名称", index = 11)
// @ApiModelProperty(value = "乘用车vpps中文名称")
// private String CYCVPPSCN;
//
// @ColumnWidth(20)
// @ExcelProperty(value = "卡车VPPS编码", index = 12)
// @ApiModelProperty(value = "卡车VPPS编码")
// private String KCCVPPSBM;
//
// @ColumnWidth(20)
// @ExcelProperty(value = "卡车vpps中文名称", index = 13)
// @ApiModelProperty(value = "卡车vpps中文名称")
// private String KCCVPPSCN;
@ApiModelProperty(value = "责任工程师")
// @ExcelProperty(value = "责任工程师", index = 17)
adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/dao/TsRoleDao.java
+1 -1
View File
@@ -41,7 +41,7 @@ public interface TsRoleDao extends BaseMapper<TsRole> {
* @param menuId：权限ID
*/
@Insert("insert into ts_role_menu (role_id,menu_id) values (#{roleId},#{menuId})")
void addMenu(String roleId, String menuId);
void addMenu(@Param("roleId") String roleId, @Param("menuId") String menuId);
/**
* 删除权限
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandAttrInfoDto.java
+12 -12
View File
@@ -50,18 +50,18 @@ public class StandAttrInfoDto {
//责任部门
@ExcelProperty("责任部门")
private String ZRBM;
//关联模块--卡车VPPS编码
@ExcelProperty("关联模块--卡车VPPS编码")
private String KCCVPPSBM;
//关联模块--卡车vpps中文名称
@ExcelProperty("关联模块--卡车vpps中文名称")
private String KCCVPPSCN;
//关联模块--乘用车VPPS编码
@ExcelProperty("关联模块--乘用车VPPS编码")
private String CYCVPPSBM;
//关联模块--乘用车vpps中文名称
@ExcelProperty("关联模块--乘用车vpps中文名称")
private String CYCVPPSCN;
// //关联模块--卡车VPPS编码
// @ExcelProperty("关联模块--卡车VPPS编码")
// private String KCCVPPSBM;
// //关联模块--卡车vpps中文名称
// @ExcelProperty("关联模块--卡车vpps中文名称")
// private String KCCVPPSCN;
// //关联模块--乘用车VPPS编码
// @ExcelProperty("关联模块--乘用车VPPS编码")
// private String CYCVPPSBM;
// //关联模块--乘用车vpps中文名称
// @ExcelProperty("关联模块--乘用车vpps中文名称")
// private String CYCVPPSCN;
private Long unCount;
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java
+12 -12
View File
@@ -352,13 +352,13 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
p.setStandEnName(s.getStandEnName());
for (SarStandAttrInfo a:list2){
if(s.getId().equals(a.getStandId())){
p.setCYCVPPSBM(a.getCycvppsbm());
p.setCYCVPPSCN(a.getCycvppscn());
// p.setCYCVPPSBM(a.getCycvppsbm());
// p.setCYCVPPSCN(a.getCycvppscn());
p.setSSRQ(a.getSsrq());
p.setXCXSSRQ(a.getXcxssrq());
p.setZCCSSRQ(a.getZccssrq());
p.setKCCVPPSBM(a.getKccvppsbm());
p.setKCCVPPSCN(a.getKccvppscn());
// p.setKCCVPPSBM(a.getKccvppsbm());
// p.setKCCVPPSCN(a.getKccvppscn());
p.setZRBM(a.getZrbm());
}
}
@@ -419,13 +419,13 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
p.setEndTimes(s.getEndTimes());
for (SarStandAttrInfo a:list2){
if(s.getId().equals(a.getStandId())){
p.setCYCVPPSBM(a.getCycvppsbm());
p.setCYCVPPSCN(a.getCycvppscn());
// p.setCYCVPPSBM(a.getCycvppsbm());
// p.setCYCVPPSCN(a.getCycvppscn());
p.setSSRQ(a.getSsrq());
p.setXCXSSRQ(a.getXcxssrq());
p.setZCCSSRQ(a.getZccssrq());
p.setKCCVPPSBM(a.getKccvppsbm());
p.setKCCVPPSCN(a.getKccvppscn());
// p.setKCCVPPSBM(a.getKccvppsbm());
// p.setKCCVPPSCN(a.getKccvppscn());
p.setZRBM(a.getZrbm());
}
}
@@ -521,8 +521,8 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
p.setStandEnName(s.getStandEnName());
for (SarStandAttrInfo a:userList2){
if(s.getId().equals(a.getStandId())){
p.setCYCVPPSBM(a.getCycvppsbm());
p.setCYCVPPSCN(a.getCycvppscn());
// p.setCYCVPPSBM(a.getCycvppsbm());
// p.setCYCVPPSCN(a.getCycvppscn());
if (a.getSsrq()!=null){
p.setSSRQ(a.getSsrq().substring(0,10));
}
@@ -532,8 +532,8 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
if (a.getZccssrq()!=null){
p.setZCCSSRQ(a.getZccssrq().substring(0,10));
}
p.setKCCVPPSBM(a.getKccvppsbm());
p.setKCCVPPSCN(a.getKccvppscn());
// p.setKCCVPPSBM(a.getKccvppsbm());
// p.setKCCVPPSCN(a.getKccvppscn());
p.setZRBM(a.getZrbm());
}
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/entity/TsUser.java
+4
View File
@@ -150,6 +150,10 @@ public class TsUser extends BaseEntity {
@TableField(exist = false)
private Integer size;
@TableField(exist = false)
private String token;
public TsUser() {
}
adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml
+1
View File
@@ -18,6 +18,7 @@
draft_time,
release_time,
unit,
(select group_concat(ts_institution.name) from ts_institution where find_in_set(ts_institution.id,unit)) as unitName,
(SELECT GROUP_CONCAT(UNAME) from ts_user WHERE find_in_set(USID,drafter) ) as drafterName,
(SELECT GROUP_CONCAT(UNAME) from ts_user WHERE find_in_set(USID,res_person) ) as res_personName,
(SELECT GROUP_CONCAT(UNAME) from ts_user WHERE find_in_set(USID,wg_leader) ) as wg_leaderName