liux
/
nxdt-system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug修改

This commit is contained in:
haozq 2025-03-04 19:00:38 +08:00
parent 870c277a9e
commit 106d310866
12 changed files with 106 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/SysScreen.java
View File

@ -37,9 +37,23 @@ public class SysScreen {
private String isViolation;
private String fileType;
private String id;
/**
* 设备id
*/
private String deviceId;
/**
* 工程名称
*/
private String proName;
/**
* 设备编码
*/
private String deviceCode;
/**
* 设备名称
*/
private String devName;
private String filePath;
private String createTime;
private String snapDate;

6
bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/service/impl/BusinessServiceImpl.java
View File

@ -358,7 +358,6 @@ public class BusinessServiceImpl implements BusinessService {
private AjaxResult rejectSubmit(AuditTask auditTask, String screenExamineId, String rejectSort, String rejectVersion,
String rejectId, String userId, String taskId, boolean iaAdd, String version, String repeatedSubmit, String supUserId, String contUserId, String examineType) {
//还未到业主审核
if ("0".equals(rejectSort)) {
List<String> finalList = new ArrayList<>();
@ -469,7 +468,12 @@ public class BusinessServiceImpl implements BusinessService {
}
auditTask.setExamineId(newExamineId);
auditTask.setExamineType(examineType);
if("01".equals(auditTask.getUserType())){
addCheckPerson(auditTask, null);
}else{
addCheckPerson(auditTask, userList);
}
return startFlowAble(auditTask, finalList, userId, taskId, ProcessConstants.OWNER, newFinalJudgment
, newExamineId, newSort, newProcessKey, iaAdd, "1", version);
} else {

1
bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/service/impl/FlowTaskServiceImpl.java
View File

@ -60,7 +60,6 @@ public class FlowTaskServiceImpl implements FlowTaskService {
case "01":
//监理提交 直接进入业主审核流程
break;
case "02":
//承包商提交 下一步进入监理审核流程

11
bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/ScreenController.java
View File

@ -84,6 +84,17 @@ public class ScreenController extends BaseController {
return null;
}
@PostMapping("/updateDeviceName")
@SysLog(title = "大屏", businessType = OperaType.UPDATE, logType = 0, module = "大屏->修改设备名称", details = "修改设备名称")
public AjaxResult updateDeviceName(@RequestBody SysScreen sysScreen) {
try {
return screenService.updateDeviceName(sysScreen);
} catch (Exception e) {
logger.error(e.toString(), e);
}
return null;
}
@GetMapping("/getProjectMapData")
@SysLog(title = "大屏", businessType = OperaType.QUERY, logType = 0, module = "大屏->数据总览", details = "查询地图数据")
public AjaxResult getProjectMapData(SysScreen sysScreen) {

7
bonus-modules/bonus-project/src/main/java/com/bonus/project/mapper/AdmissionRequestMapper.java
View File

@ -283,4 +283,11 @@ public interface AdmissionRequestMapper {
* @return 结果
*/
int updateSysUserInfo(AdmissionRequest bean);
/**
* 查询状态
* @param bean
* @return
*/
String getLinkStatus(AdmissionRequest bean);
}

7
bonus-modules/bonus-project/src/main/java/com/bonus/project/mapper/ScreenMapper.java
View File

@ -114,4 +114,11 @@ public interface ScreenMapper {
String getSpecialWorkNumByProId(SysScreen sysScreen);
int updateViolationPhotoStatus(SysScreen sysScreen);
/**
* 修改设备名称
* @param sysScreen
* @return
*/
int updateDeviceName(SysScreen sysScreen);
}

7
bonus-modules/bonus-project/src/main/java/com/bonus/project/service/ScreenService.java
View File

@ -95,4 +95,11 @@ public interface ScreenService {
* @return AjaxResult
*/
AjaxResult updateViolationPhotoStatus(SysScreen sysScreen);
/**
* 修改设备名称
* @param sysScreen
* @return
*/
AjaxResult updateDeviceName(SysScreen sysScreen);
}

6
bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/AdmissionRequestServiceImpl.java
View File

@ -24,6 +24,7 @@ import com.bonus.system.api.domain.SysFile;
import com.bonus.system.api.domain.SysUser;
import com.bonus.system.api.model.LoginUser;
import com.google.common.collect.Maps;
import org.hibernate.validator.internal.util.StringHelper;
import org.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -592,7 +593,12 @@ public class AdmissionRequestServiceImpl implements AdmissionRequestService {
if (StaticVariableUtils.SUBMIT.equals(jsonObject.optString("submitType"))) {
bean.setStatus("8");
} else {
String hisStatus=arMapper.getLinkStatus(bean);
if(StringHelper.isNullOrEmptyString(hisStatus)){
bean.setStatus("9");
}else{
bean.setStatus(hisStatus);
}
}
code = arMapper.updateLinkStatus(bean);
if (code == 0) {

22
bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ScreenServiceImpl.java
View File

@ -10,6 +10,8 @@ import com.bonus.project.mapper.ScreenMapper;
import com.bonus.project.service.ScreenService;
import com.bonus.system.api.RemoteFileService;
import com.bonus.system.api.domain.SysFile;
import lombok.extern.slf4j.Slf4j;
import org.hibernate.validator.internal.util.StringHelper;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@ -28,6 +30,7 @@ import java.util.Map;
* @description:
*/
@Service
@Slf4j
public class ScreenServiceImpl implements ScreenService {
@Resource
private ScreenMapper screenMapper;
@ -222,4 +225,23 @@ public class ScreenServiceImpl implements ScreenService {
}
return null;
}
@Override
public AjaxResult updateDeviceName(SysScreen sysScreen) {
try{
if(StringHelper.isNullOrEmptyString(sysScreen.getDeviceId())){
return AjaxResult.error("未选择设备");
}
if(StringHelper.isNullOrEmptyString(sysScreen.getDevName())){
return AjaxResult.error("请填写设备名称");
}
int num=screenMapper.updateDeviceName(sysScreen);
if(num>0){
return AjaxResult.success("修改成功");
}
}catch (Exception e){
log.error(e.toString(),e);
}
return AjaxResult.error("修改失败,系统异常请联系管理员");
}
}

21
bonus-modules/bonus-project/src/main/resources/mapper/system/AdmissionRequestMapper.xml
View File

@ -272,10 +272,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
lk_cont_person lkc
LEFT JOIN
pt_cons_person pcp ON lkc.cons_persion_id = pcp.cons_user_id
AND pcp.is_active = '1'
LEFT JOIN sys_dict_data sdd ON pcp.post = sdd.dict_value AND sdd.dict_type = 'sys_cons_post'
<where>
pcp.is_active = '1'
<if test="proId != null and proId != ''">
AND lkc.pro_id = #{proId}
</if>
@ -581,6 +580,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</if>
</select>
<insert id="addPtCheckConfigurationDetails">
insert into pt_check_configuration_details(
examine_id,node_name,check_person,examine_type,final_judgment,create_time,is_active,sort,deptId,version
@ -605,8 +605,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<update id="updateLinkStatus">
<if test="userType == '02'">
update lk_pro_cont set into_status = #{status},admission_date = #{admissionDate} where pro_id = #{proId}
and cont_uuid =
#{consUuid}
and cont_uuid =#{consUuid}
</if>
<if test="userType == '03'">
update lk_cont_sub set into_status = #{status},admission_date = #{admissionDate} where pro_id = #{proId}
@ -615,6 +614,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
sub_uuid = #{subUuid}
</if>
</update>
<select id="getLinkStatus" resultType="java.lang.String">
<if test="userType == '02'">
select into_status
from lk_pro_cont
where pro_id = #{proId} and cont_uuid =#{consUuid}
</if>
<if test="userType == '03'">
select into_status
from lk_cont_sub
where pro_id = #{proId} and cont_uuid = #{consUuid} and sub_uuid = #{subUuid}
</if>
</select>
<update id="changeFlowStatus">
update pt_flow_process set status = #{status} where examine_id = #{examineId}
</update>

6
bonus-modules/bonus-project/src/main/resources/mapper/system/ConsApprovalMapper.xml
View File

@ -78,9 +78,9 @@
</foreach>
)
</if>
<if test="status==2 or status=='2'">
and lpc.into_status = #{status}
</if>
<!-- <if test="status==2 or status=='2'">-->
<!-- and lpc.into_status = #{status}-->
<!-- </if>-->
</select>
<select id="getAuditRecord" resultType="com.bonus.project.domain.AuditBean">
<if test="userType == '01'">

5
bonus-modules/bonus-project/src/main/resources/mapper/system/ScreenMapper.xml
View File

@ -13,6 +13,10 @@
SET is_violation = #{isViolation}
WHERE id = #{id}
</update>
<update id="updateDeviceName">
UPDATE pf_device_info SET device_name=#{devName}
where device_id=#{deviceId}
</update>
<select id="getProData" resultType="java.lang.Integer">
SELECT COUNT(*)
FROM pt_project_info
@ -125,6 +129,7 @@
</select>
<select id="getVideoList" resultType="com.bonus.common.entity.SysScreen">
select
pdi.device_id deviceId,
pdi.device_name as name,
pdi.device_status as status,
pdi.puid,