haozq
/
ah_sz_gqj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
lSun 2024-07-23 14:57:28 +08:00
parent 5eaa25a14d 3739f1fcce
commit f1a00c3cf8
9 changed files with 29 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/bonus/aqgqj/basis/entity/dto/ParamsDto.java
View File

@ -62,11 +62,6 @@ public class ParamsDto extends PageEntity {
/** /**
* 班组ID * 班组ID
*/ */
private String teamId = UserUtil.getLoginUser() !=null && StringUtils.isNotBlank(UserUtil.getLoginUser().getTeamId()) ? UserUtil.getLoginUser().getTeamId() : "-1"; private String teamId = UserUtil.getLoginUser() !=null && StringUtils.isNotBlank(UserUtil.getLoginUser().getTeamId()) ? UserUtil.getLoginUser().getTeamId() : null;
/**
* 是否是班组长
*/
private String isTeamLeader = UserUtil.getLoginUser() !=null && StringUtils.isNotBlank(UserUtil.getLoginUser().getIsTeamLeader()) ? UserUtil.getLoginUser().getIsTeamLeader() : "0";
} }

1
src/main/java/com/bonus/aqgqj/basis/entity/vo/ExperConfigVo.java
View File

@ -93,6 +93,7 @@ public class ExperConfigVo {
/** /**
* 试验设备 * 试验设备
*/ */
@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
private List<ConfigDevVo> deviceVos; private List<ConfigDevVo> deviceVos;
/** /**

30
src/main/java/com/bonus/aqgqj/basis/service/impl/ExperimentStandardServiceImpl.java
View File

@ -76,7 +76,7 @@ public class ExperimentStandardServiceImpl implements ExperimentStandardService
if (experConfigVo == null) { if (experConfigVo == null) {
return ServerResponse.createByErrorMsg(HttpStatus.ERROR, "参数异常"); return ServerResponse.createByErrorMsg(HttpStatus.ERROR, "参数异常");
} }
// 试验设备、试验主要设备、试验依据、试验项校验 // 试验主要设备、试验依据、试验项校验
String result2 = singleValidators(experConfigVo); String result2 = singleValidators(experConfigVo);
if (StringUtils.isNotBlank(result2)) { if (StringUtils.isNotBlank(result2)) {
return ServerResponse.createByErrorMsg(HttpStatus.ERROR, result2); return ServerResponse.createByErrorMsg(HttpStatus.ERROR, result2);
@ -88,11 +88,6 @@ public class ExperimentStandardServiceImpl implements ExperimentStandardService
} }
// 添加试验依据 // 添加试验依据
mapper.addBasiss(experConfigVo.getBasisVos()); mapper.addBasiss(experConfigVo.getBasisVos());
// 添加试验设备
for (ConfigDevVo deviceVo : experConfigVo.getDeviceVos()) {
deviceVo.setConfigId(experConfigVo.getId());
}
mapper.addDev(experConfigVo.getDeviceVos());
// 添加试验主要设备 // 添加试验主要设备
for (ConfigMainDevVo mainDeviceVo : experConfigVo.getMainDeviceVos()) { for (ConfigMainDevVo mainDeviceVo : experConfigVo.getMainDeviceVos()) {
mainDeviceVo.setConfigId(experConfigVo.getId()); mainDeviceVo.setConfigId(experConfigVo.getId());
@ -145,16 +140,15 @@ public class ExperimentStandardServiceImpl implements ExperimentStandardService
if (experConfigVo == null) { if (experConfigVo == null) {
return ServerResponse.createByErrorMsg(HttpStatus.ERROR, "参数异常"); return ServerResponse.createByErrorMsg(HttpStatus.ERROR, "参数异常");
} }
// 试验设备、试验主要设备、试验依据、试验项校验 // 试验主要设备、试验依据、试验项校验
String result2 = singleValidators(experConfigVo); String result2 = singleValidators(experConfigVo);
if (StringUtils.isNotBlank(result2)) { if (StringUtils.isNotBlank(result2)) {
return ServerResponse.createByErrorMsg(HttpStatus.ERROR, result2); return ServerResponse.createByErrorMsg(HttpStatus.ERROR, result2);
} }
// 先删除试验依据、试验设备、试验主要设备、试验项、试验项内容后 在进行重新添加 // 先删除试验依据、试验主要设备、试验项、试验项内容后 在进行重新添加
ParamsDto dto = new ParamsDto(); ParamsDto dto = new ParamsDto();
dto.setId(experConfigVo.getId()); dto.setId(experConfigVo.getId());
mapper.delExperBasis(dto); mapper.delExperBasis(dto);
mapper.delConfigDev(dto);
mapper.delConfigManDev(dto); mapper.delConfigManDev(dto);
List<ConfigItemsVo> configItemsVos = mapper.getConfigItems(dto.getId()); List<ConfigItemsVo> configItemsVos = mapper.getConfigItems(dto.getId());
mapper.delItems(configItemsVos); mapper.delItems(configItemsVos);
@ -166,10 +160,6 @@ public class ExperimentStandardServiceImpl implements ExperimentStandardService
} }
// 添加试验依据 // 添加试验依据
mapper.addBasiss(experConfigVo.getBasisVos()); mapper.addBasiss(experConfigVo.getBasisVos());
// 添加试验设备
for (ConfigDevVo deviceVo : experConfigVo.getDeviceVos()) {
deviceVo.setConfigId(experConfigVo.getId());
}
mapper.addDev(experConfigVo.getDeviceVos()); mapper.addDev(experConfigVo.getDeviceVos());
// 添加试验主要设备 // 添加试验主要设备
for (ConfigMainDevVo mainDeviceVo : experConfigVo.getMainDeviceVos()) { for (ConfigMainDevVo mainDeviceVo : experConfigVo.getMainDeviceVos()) {
@ -206,9 +196,8 @@ public class ExperimentStandardServiceImpl implements ExperimentStandardService
ExperConfigVo vo = null; ExperConfigVo vo = null;
try { try {
vo = mapper.getExperConfig(data); vo = mapper.getExperConfig(data);
// 查询试验配置依据、试验设备、试验主要设备、试验项信息 // 查询试验配置依据、试验主要设备、试验项信息
List<ExperBasisVo> basisVos= mapper.getExperBasis(vo.getId()); List<ExperBasisVo> basisVos= mapper.getExperBasis(vo.getId());
List<ConfigDevVo> deviceVos = mapper.getConfigDev(vo.getId());
List<ConfigMainDevVo> mainDevVos = mapper.getConfigMainDev(vo.getId()); List<ConfigMainDevVo> mainDevVos = mapper.getConfigMainDev(vo.getId());
List<ConfigItemsVo> configItemsVos = mapper.getConfigItems(vo.getId()); List<ConfigItemsVo> configItemsVos = mapper.getConfigItems(vo.getId());
for (ConfigItemsVo configItemsVo : configItemsVos) { for (ConfigItemsVo configItemsVo : configItemsVos) {
@ -216,7 +205,6 @@ public class ExperimentStandardServiceImpl implements ExperimentStandardService
configItemsVo.setItemList(configItemVos); configItemsVo.setItemList(configItemVos);
} }
vo.setBasisVos(basisVos); vo.setBasisVos(basisVos);
vo.setDeviceVos(deviceVos);
vo.setMainDeviceVos(mainDevVos); vo.setMainDeviceVos(mainDevVos);
vo.setConfigItemsVos(configItemsVos); vo.setConfigItemsVos(configItemsVos);
return ServerResponse.createSuccess(vo); return ServerResponse.createSuccess(vo);
@ -232,7 +220,6 @@ public class ExperimentStandardServiceImpl implements ExperimentStandardService
try { try {
mapper.delExperConfig(dto); mapper.delExperConfig(dto);
mapper.delExperBasis(dto); mapper.delExperBasis(dto);
mapper.delConfigDev(dto);
mapper.delConfigManDev(dto); mapper.delConfigManDev(dto);
List<ConfigItemsVo> configItemsVos = mapper.getConfigItems(dto.getId()); List<ConfigItemsVo> configItemsVos = mapper.getConfigItems(dto.getId());
mapper.delItems(configItemsVos); mapper.delItems(configItemsVos);
@ -316,7 +303,7 @@ public class ExperimentStandardServiceImpl implements ExperimentStandardService
} }
/** /**
* 试验项、试验项内容、试验依据、试验设备、主要试验设备数据校验 * 试验项、试验项内容、试验依据、主要试验设备数据校验
* *
* @param vo * @param vo
* @return String * @return String
@ -324,16 +311,9 @@ public class ExperimentStandardServiceImpl implements ExperimentStandardService
* @date 2024/7/18 19:17 * @date 2024/7/18 19:17
*/ */
public String singleValidators(ExperConfigVo vo) { public String singleValidators(ExperConfigVo vo) {
List<ConfigDevVo> deviceVos = vo.getDeviceVos();
List<ConfigMainDevVo> mainDeviceVos = vo.getMainDeviceVos(); List<ConfigMainDevVo> mainDeviceVos = vo.getMainDeviceVos();
List<ExperBasisVo> basisVos = vo.getBasisVos(); List<ExperBasisVo> basisVos = vo.getBasisVos();
List<ConfigItemsVo> configItemsVos = vo.getConfigItemsVos(); List<ConfigItemsVo> configItemsVos = vo.getConfigItemsVos();
for (ConfigDevVo deviceVo : deviceVos) {
String validResult = validatorsUtils.valid(deviceVo, ConfigDevVo.Query.class);
if (StringUtils.isNotBlank(validResult)) {
return validResult;
}
}
for (ConfigMainDevVo mainDeviceVo : mainDeviceVos) { for (ConfigMainDevVo mainDeviceVo : mainDeviceVos) {
String validResult = validatorsUtils.valid(mainDeviceVo, ConfigMainDevVo.Query.class); String validResult = validatorsUtils.valid(mainDeviceVo, ConfigMainDevVo.Query.class);
if (StringUtils.isNotBlank(validResult)) { if (StringUtils.isNotBlank(validResult)) {

2
src/main/java/com/bonus/aqgqj/model/SysUser.java
View File

@ -115,8 +115,6 @@ public class SysUser extends PageEntity {
private String roleCode; private String roleCode;
/**班组ID*/ /**班组ID*/
private String teamId; private String teamId;
/**是否是班组长*/
private String isTeamLeader;
public interface Status { public interface Status {

16
src/main/java/com/bonus/aqgqj/utils/SystemUtils.java
View File

@ -68,7 +68,7 @@ public class SystemUtils {
} }
/** /**
* 是否是试验班组-试验人员 * 是否是试验班组-班组成员
* @return Boolean * @return Boolean
* @author cwchen * @author cwchen
* @date 2024/7/23 9:30 * @date 2024/7/23 9:30
@ -78,11 +78,8 @@ public class SystemUtils {
return false; return false;
} }
String roleCode = StringUtils.isNotBlank(UserUtil.getLoginUser().getRoleCode()) ? UserUtil.getLoginUser().getRoleCode() : null; String roleCode = StringUtils.isNotBlank(UserUtil.getLoginUser().getRoleCode()) ? UserUtil.getLoginUser().getRoleCode() : null;
String teamId = StringUtils.isNotBlank(UserUtil.getLoginUser().getTeamId()) ? UserUtil.getLoginUser().getTeamId() : "-1"; String teamId = StringUtils.isNotBlank(UserUtil.getLoginUser().getTeamId()) ? UserUtil.getLoginUser().getTeamId() : null;
String isTeamLeader = StringUtils.isNotBlank(UserUtil.getLoginUser().getIsTeamLeader()) ? UserUtil.getLoginUser().getIsTeamLeader() : "0"; if(Objects.equals(Constants.EXPERIMPERIMENTALTEAMMEMBER,roleCode)&& teamId!=null){
if(Objects.equals(Constants.EXPERIMENTALTEAM,roleCode)
&& !Objects.equals(Constants.VALUE_DATA,teamId)
&& Objects.equals(isTeamLeader,Constants.VALUE_DATA2)){
return true; return true;
}else if(Objects.equals(Constants.ADMIDMINISTRATORS,roleCode) ){ }else if(Objects.equals(Constants.ADMIDMINISTRATORS,roleCode) ){
return true; return true;
@ -102,11 +99,8 @@ public class SystemUtils {
return false; return false;
} }
String roleCode = StringUtils.isNotBlank(UserUtil.getLoginUser().getRoleCode()) ? UserUtil.getLoginUser().getRoleCode() : null; String roleCode = StringUtils.isNotBlank(UserUtil.getLoginUser().getRoleCode()) ? UserUtil.getLoginUser().getRoleCode() : null;
String teamId = StringUtils.isNotBlank(UserUtil.getLoginUser().getTeamId()) ? UserUtil.getLoginUser().getTeamId() : "-1"; String teamId = StringUtils.isNotBlank(UserUtil.getLoginUser().getTeamId()) ? UserUtil.getLoginUser().getTeamId() : null;
String isTeamLeader = StringUtils.isNotBlank(UserUtil.getLoginUser().getIsTeamLeader()) ? UserUtil.getLoginUser().getIsTeamLeader() : "0"; if(Objects.equals(Constants.EXPERIMENTALTEAMLEADER,roleCode) && teamId!=null){
if(Objects.equals(Constants.EXPERIMENTALTEAM,roleCode)
&& !Objects.equals(Constants.VALUE_DATA,teamId)
&& Objects.equals(isTeamLeader,Constants.VALUE_DATA3)){
return true; return true;
}else if(Objects.equals(Constants.ADMIDMINISTRATORS,roleCode) ){ }else if(Objects.equals(Constants.ADMIDMINISTRATORS,roleCode) ){
return true; return true;

16
src/main/java/com/bonus/aqgqj/webResult/Constants.java
View File

@ -146,14 +146,18 @@ public class Constants
/**管理员*/ /**管理员*/
public static final String ADMIDMINISTRATORS = "administrators"; public static final String ADMIDMINISTRATORS = "administrators";
/**技术负责人*/ /**技术负责人-审核权限*/
public static final String TECHNICALDIRECTOR = "technicalDirector"; public static final String TECHNICALDIRECTOR = "technicalDirector";
/**中心负责人*/ /**中心负责人-审批权限*/
public static final String CENTERTRALMANAGER = "centerManager"; public static final String CENTERTRALMANAGER = "centerManager";
/**试验班组*/ /**试验班组长-审阅权限*/
public static final String EXPERIMENTALTEAM = "experimentalTeam"; public static final String EXPERIMENTALTEAMLEADER = "experimentalTeamLeader";
/**综合班组*/ /**综合班组长-收样、派工*/
public static final String INTEGRATEDTEAM = "integratedTeam"; public static final String INTEGRATEDTEAMLEADER = "integratedTeamLeader";
/**试验班组成员-试验填写/提交试验审阅*/
public static final String EXPERIMPERIMENTALTEAMMEMBER = "experimentalTeamMember";
/**综合班组成员-收样权限*/
public static final String INTEGRATEDTEAMMEMBER = "integratedTeamMember";
public static final String VALUE_DATA = "-1"; public static final String VALUE_DATA = "-1";
public static final String VALUE_DATA2 = "0"; public static final String VALUE_DATA2 = "0";

6
src/main/resources/mappers/basis/ExamineMapper.xml
View File

@ -61,12 +61,12 @@
AND INSTR(tsd.sampleDevCode,#{devTypeCode}) AND INSTR(tsd.sampleDevCode,#{devTypeCode})
</if> </if>
/*管理员、技术负责人、中心负责人查询全部数据*/ /*管理员、技术负责人、中心负责人查询全部数据*/
<if test="roleCode != 'administrators' and roleCode != 'technicalDirector' and roleCode != 'centerManager' and roleCode == 'experimentalTeam'"> <if test="roleCode != 'administrators' and roleCode != 'technicalDirector' and roleCode != 'centerManager' and roleCode == 'experimentalTeamLeader'">
/*试验班组-班组长审阅-只审阅本班组提交的审阅*/ /*试验班组-班组长审阅-只审阅本班组提交的审阅*/
<if test="teamId != '-1' and isTeamLeader == '1'"> <if test="teamId != null">
AND ts.team_id = #{teamId} AND ts.team_id = #{teamId}
</if> </if>
<if test="and teamId != '-1' and isTeamLeader == '0'"> <if test="teamId ==null">
AND ts.team_id = -1 AND ts.team_id = -1
</if> </if>
</if> </if>

6
src/main/resources/mappers/basis/ExperimentalMapper.xml
View File

@ -294,10 +294,10 @@
AND INSTR(tsd.sampleDevCode,#{devTypeCode}) AND INSTR(tsd.sampleDevCode,#{devTypeCode})
</if> </if>
<if test="roleCode != 'administrators'"> <if test="roleCode != 'administrators'">
<if test="roleCode == 'experimentalTeam' and teamId != '-1' and isTeamLeader == '0'"> <if test="roleCode == 'experimentalTeamMember' and teamId != null">
AND ts.team_id = #{teamId} AND ts.team_id = #{teamId}
</if> </if>
<if test="(roleCode != 'experimentalTeam') or (roleCode == 'experimentalTeam' and teamId != '-1' and isTeamLeader == '1')"> <if test="(roleCode != 'experimentalTeamMember') or (roleCode == 'experimentalTeamMember' and teamId == null)">
AND ts.team_id = -1 AND ts.team_id = -1
</if> </if>
</if> </if>
@ -490,7 +490,7 @@
</foreach> </foreach>
AND del_flag = 0 AND del_flag = 0
AND ( AND (
process_status IS NULL (process_status IS NULL) OR
(audti_status = 0 AND process_status = 1) OR (audti_status = 0 AND process_status = 1) OR
(audti_status = 0 AND process_status = 2) OR (audti_status = 0 AND process_status = 2) OR
(audti_status = 0 AND process_status = 3) OR (audti_status = 0 AND process_status = 3) OR

2
src/main/resources/mappers/system/UserMapper.xml
View File

@ -50,7 +50,7 @@
<select id="getUser" parameterType="String" resultType="com.bonus.aqgqj.model.SysUser"> <select id="getUser" parameterType="String" resultType="com.bonus.aqgqj.model.SysUser">
select t.id,t.user_name as username,t.login_name as loginName, select t.id,t.user_name as username,t.login_name as loginName,
t.password,t.state,t.role_id as roleId,t.login_type loginType,t.new_user newUser, t.password,t.state,t.role_id as roleId,t.login_type loginType,t.new_user newUser,
sr.role_code AS roleCode,sr.role_name AS roleName,t.team_id AS teamId,t.is_team_leader AS isTeamLeader sr.role_code AS roleCode,sr.role_name AS roleName,t.team_id AS teamId
from sys_user t from sys_user t
LEFT JOIN sys_role sr ON t.role_id = sr.role_id AND sr.del_flag = 0 LEFT JOIN sys_role sr ON t.role_id = sr.role_id AND sr.del_flag = 0
where t.login_name = #{username} where t.login_name = #{username}