sxyanzhu
/
jhprjv2
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update code

dev_xds
haha 2024-06-11 23:33:06 +08:00
parent 895537a762
commit f43818ff7d
7 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-ui/vue.config.js
View File

@ -34,8 +34,8 @@ module.exports = {
open: true,
proxy: {
[process.env.VUE_APP_BASE_API]: {
//target: `http://127.0.0.1:8090/jhapi`,
target: `http://192.168.126.20:808/jhapi`,
target: `http://127.0.0.1:8090/jhapi`,
//target: `http://192.168.126.20:808/jhapi`,
changeOrigin: true,
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: ''

4
yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAuditinfoServiceImpl.java
View File

@ -187,7 +187,7 @@ public class SurProjectAuditinfoServiceImpl implements ISurProjectAuditinfoServi
if(StringUtils.isNotEmpty(zlDataList)){
for(Map<String, Object> map:zlDataList){
String state = Convert.toStr(map.get("checkState"));
if(Objects.equals(state,"0") || Objects.equals(state,"1")){
if(Objects.equals(state,"0") || Objects.equals(state,"1") || Objects.equals(state,"3")){
zlCount += Convert.toInt(map.get("total"));
}
}
@ -198,7 +198,7 @@ public class SurProjectAuditinfoServiceImpl implements ISurProjectAuditinfoServi
if(StringUtils.isNotEmpty(aqDataList)){
for(Map<String, Object> map:aqDataList){
String state = Convert.toStr(map.get("checkState"));
if(Objects.equals(state,"0") || Objects.equals(state,"1")){
if(Objects.equals(state,"0") || Objects.equals(state,"1") || Objects.equals(state,"3")){
aqCount += Convert.toInt(map.get("total"));
}
}

2
yanzhu-jh/src/main/java/com/yanzhu/jh/publics/PublicsController.java
View File

@ -262,7 +262,7 @@ PublicsController extends BaseController {
flowTaskEntity.setNowUser(Convert.toStr(SecurityUtils.getUserId()));
flowTaskEntity.setRoleIds(SecurityUtils.getLoginUser().getUser().getRoles().stream().map(role -> role.getRoleId()).collect(Collectors.toList()));
flowTaskEntity.setNowUserName(getUsername());
flowTaskEntity.setActiveName("await");
flowTaskEntity.setActiveName("awaitSum");
return success(surProjectAuditinfoService.findMyTask(flowTaskEntity));
}

1
yanzhu-jh/src/main/resources/mapper/project/SurProjectAuditinfoMapper.xml
View File

@ -70,6 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<!--管理员放开查询条件-->
<if test='nowRole != "1" and nowRole != "2"'> and a.witness_user like concat('%', #{nowUserName}, '%')</if>
<if test='activeName == "await"'> and a.approve_status='1'</if>
<if test='activeName == "awaitSum"'> and a.approve_status in ('1','3') or a.approve_status is null</if>
<if test='activeName == "finished"'> and a.approve_status in ('3','4')</if>
<if test="businessKey != null and businessKey != ''"> and sp.id = #{businessKey}</if>
<if test="businessKeyName != null and businessKeyName != ''"> and sp.projectName like concat('%', #{businessKeyName}, '%')</if>

1
yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckDetectionMapper.xml
View File

@ -71,6 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="detectionResult != null and detectionResult != ''"> and spcd.detection_result = #{detectionResult}</if>
<!-- 查询条件-项目部门 -->
<if test="projectDeptId != null "> and sp.deptId = #{projectDeptId}</if>
<if test="projectName != null and projectName != ''"> and sp.projectName like concat('%', #{projectName}, '%')</if>
<!--子部门数据-->
<if test='nowRole == "4"'> and sp.deptId = #{nowDept}</if>
<!--监理单位/总包公司/分包单位查询当前关联数据-->

2
yanzhu-jh/src/main/resources/mapper/project/SurProjectMaterialSealMapper.xml
View File

@ -56,6 +56,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="materialResult != null and materialResult != ''"> and spme.material_result = #{materialResult}</if>
<if test="approveStatus != null and approveStatus != ''"> and spme.approve_status = #{approveStatus}</if>
<if test="witnessUser != null and witnessUser != ''"> and (spme.witness_user like concat('%', #{witnessUser}, '%') or spme.witness_user_name like concat('%', #{witnessUser}, '%'))</if>
<if test="projectName != null and projectName != ''"> and sp.projectName like concat('%', #{projectName}, '%')</if>
<!-- 查询条件-项目部门 -->
<if test="projectDeptId != null "> and sp.deptId = #{projectDeptId}</if>
<!--子部门数据-->

1
yanzhu-jh/src/main/resources/mapper/project/SurProjectMeasureMapper.xml
View File

@ -64,6 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="approveStatus != null and approveStatus != ''"> and spm.approve_status = #{approveStatus}</if>
<!-- 查询条件-项目部门 -->
<if test="projectDeptId != null "> and sp.deptId = #{projectDeptId}</if>
<if test="projectName != null and projectName != ''"> and sp.projectName like concat('%', #{projectName}, '%')</if>
<!--子部门数据-->
<if test='nowRole == "4"'> and sp.deptId = #{nowDept}</if>
<!--监理单位/总包公司/分包单位查询当前关联数据-->