bonus
/
sh_real_name_system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

This commit is contained in:
方亮 2025-08-18 17:21:51 +08:00
parent 4170882138 e882960e91
commit 8cf769ef70
14 changed files with 75 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteUrkUtilsFallbackFactory.java
View File

@ -2,6 +2,7 @@ package com.bonus.system.api.factory;
import com.bonus.common.core.domain.R;
import com.bonus.system.api.RemoteUrkUtilsService;
import com.bonus.system.api.domain.SystemParamsVo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.cloud.openfeign.FallbackFactory;
@ -44,6 +45,11 @@ public class RemoteUrkUtilsFallbackFactory implements FallbackFactory<RemoteUrkU
R.fail("人员出场:" + throwable.getMessage());
}
@Override
public void delUserByDeviceList(SystemParamsVo paramsVo, String source) {
R.fail("人员批量出场报错:" + throwable.getMessage());
}
};
}

17
bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmProjectController.java
View File

@ -21,6 +21,7 @@ import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/**
* 标段工程
@ -138,4 +139,20 @@ public class PmProjectController extends BaseController {
}
return getDataTableError(new ArrayList<>());
}
/**
* 获取工程人员出入场信息
*/
/*@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("pm:company:del"))*/
@PostMapping("/getPeoNum")
@SysLog(title = "标段工程", businessType = OperaType.UPDATE, logType = 0, module = "标段工程->获取班组人员出入场信息")
public AjaxResult getPeoNum(@Validated @RequestBody BmSubContract bmSubContract) {
try {
Map<String, Object> res = pmProjectService.getPeoNum(bmSubContract);
return success(res);
} catch (Exception e) {
logger.error(e.toString(), e);
}
return error("系统异常,请联系管理员");
}
}

5
bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmSubTeamContractController.java
View File

@ -2,7 +2,6 @@ package com.bonus.bmw.controller;
import com.bonus.bmw.domain.dto.FileBasicMsgDto;
import com.bonus.bmw.domain.dto.WebFileDto;
import com.bonus.bmw.domain.po.BmSubContract;
import com.bonus.bmw.domain.po.PmSubTeamContract;
import com.bonus.bmw.service.PmSubTeamContractService;
import com.bonus.common.core.utils.json.FastJsonHelper;
@ -117,9 +116,9 @@ public class PmSubTeamContractController extends BaseController {
/*@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("pm:company:del"))*/
@PostMapping("/getPeoNum")
@SysLog(title = "分包班组入场信息", businessType = OperaType.UPDATE, logType = 0, module = "分包班组入场信息->获取班组人员出入场信息")
public AjaxResult getPeoNum(@Validated @RequestBody BmSubContract bmSubContract) {
public AjaxResult getPeoNum(@Validated @RequestBody PmSubTeamContract pmSubTeamContract) {
try {
Map<String, Object> res = pmSubTeamContractService.getPeoNum(bmSubContract);
Map<String, Object> res = pmSubTeamContractService.getPeoNum(pmSubTeamContract);
return success(res);
} catch (Exception e) {
logger.error(e.toString(), e);

9
bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/po/BmSubContract.java
View File

@ -1,6 +1,5 @@
package com.bonus.bmw.domain.po;
import com.bonus.common.core.annotation.Excel;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
@ -22,13 +21,11 @@ public class BmSubContract {
/**
* 分包合同编码
*/
@Excel(name = "分包合同编码",sort = 1)
private String subContractCode;
/**
* 分包合同名称
*/
@Excel(name = "分包合同名称",sort = 2)
private String subContractName;
/**
@ -39,7 +36,6 @@ public class BmSubContract {
/**
* 分包商名称
*/
@Excel(name = "分包商名称",sort = 3)
private String subName;
/**
@ -50,19 +46,17 @@ public class BmSubContract {
/**
* 工程名称
*/
@Excel(name = "工程名称",sort = 4)
private String proName;
/**
* 分包入场日期
*/
@Excel(name = "分包入场时间",sort = 6)
private String subEinTime;
/**
* 分包出场时间
*/
@Excel(name = "分包入场时间",sort = 7)
private String subExitTime;
/**
@ -95,7 +89,6 @@ public class BmSubContract {
/**
*1 已入场 2 已离场
*/
@Excel(name = "出入场状态",sort = 5,readConverterExp = "1=在场,2=出场")
private String subEinStatus;
/**

8
bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/BmSubContractVo.java
View File

@ -1,5 +1,6 @@
package com.bonus.bmw.domain.vo;
import com.bonus.common.core.annotation.Excel;
import com.bonus.system.api.model.UploadFileVo;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
@ -22,11 +23,13 @@ public class BmSubContractVo {
/**
* 分包合同编码
*/
@Excel(name = "分包合同编码",sort = 1)
private String subContractCode;
/**
* 分包合同名称
*/
@Excel(name = "分包合同名称",sort = 2)
private String subContractName;
/**
@ -37,6 +40,7 @@ public class BmSubContractVo {
/**
* 分包名称
*/
@Excel(name = "分包商名称",sort = 3)
private String subName;
/**
@ -47,16 +51,19 @@ public class BmSubContractVo {
/**
* 工程名称
*/
@Excel(name = "工程名称",sort = 4)
private String proName;
/**
* 分包入场日期
*/
@Excel(name = "分包入场时间",sort = 6)
private String subEinTime;
/**
* 分包出场时间
*/
@Excel(name = "分包出场时间",sort = 7)
private String subExitTime;
/**
@ -89,6 +96,7 @@ public class BmSubContractVo {
/**
*1 已入场 2 已离场
*/
@Excel(name = "出入场状态",sort = 5,readConverterExp = "1=在场,2=出场")
private String subEinStatus;
/**

7
bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmProjectMapper.java
View File

@ -66,4 +66,11 @@ public interface PmProjectMapper {
* @return
*/
List<PmProjectVo> selectProjectListAll(PmProject pmProject);
/**
* 获取工程人员出入场信息
* @param bmSubContract
* @return
*/
Integer getPeoNum(BmSubContract bmSubContract);
}

3
bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmSubTeamContractMapper.java
View File

@ -1,6 +1,5 @@
package com.bonus.bmw.mapper;
import com.bonus.bmw.domain.po.BmSubContract;
import com.bonus.bmw.domain.po.PmSubTeamContract;
import com.bonus.bmw.domain.vo.PmWorker;
@ -31,5 +30,5 @@ public interface PmSubTeamContractMapper {
List<PmWorker> getPmWorkerByTeamId(Integer id);
Integer countProNum(BmSubContract bmSubContract);
Integer countProNum(PmSubTeamContract pmSubTeamContract);
}

8
bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/PmProjectService.java
View File

@ -5,6 +5,7 @@ import com.bonus.bmw.domain.po.PmProject;
import com.bonus.bmw.domain.vo.PmProjectVo;
import java.util.List;
import java.util.Map;
public interface PmProjectService {
@ -35,4 +36,11 @@ public interface PmProjectService {
* @return
*/
List<PmProjectVo> selectProjectListAll(PmProject pmProject);
/**
* 获取工程人员出入场信息
* @param bmSubContract
* @return
*/
Map<String, Object> getPeoNum(BmSubContract bmSubContract);
}

3
bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/PmSubTeamContractService.java
View File

@ -1,7 +1,6 @@
package com.bonus.bmw.service;
import com.bonus.bmw.domain.dto.FileBasicMsgDto;
import com.bonus.bmw.domain.po.BmSubContract;
import com.bonus.bmw.domain.po.PmSubTeamContract;
import java.util.List;
@ -24,5 +23,5 @@ public interface PmSubTeamContractService {
*/
PmSubTeamContract getSubTeamContractById(PmSubTeamContract pmSubTeamContract);
Map<String, Object> getPeoNum(BmSubContract bmSubContract);
Map<String, Object> getPeoNum(PmSubTeamContract pmSubTeamContract);
}

17
bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmProjectServiceImpl.java
View File

@ -14,7 +14,9 @@ import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* @author 马三炮
@ -56,7 +58,7 @@ public class PmProjectServiceImpl implements PmProjectService {
pmProject.setUpdateTime(new Date());
res= pmProjectMapper.updateProject(pmProject);
//修改总工程状态
updatePmMainProject(pmProjectOld.getMainProId());
updatePmMainProject(pmProject.getMainProId());
}else {
if (StringUtils.isNotNull(pmProjectOld)){
@ -123,4 +125,17 @@ public class PmProjectServiceImpl implements PmProjectService {
public List<PmProjectVo> selectProjectListAll(PmProject pmProject) {
return pmProjectMapper.selectProjectListAll(pmProject);
}
/**
* 获取工程人员出入场信息
* @param bmSubContract
* @return
*/
@Override
public Map<String, Object> getPeoNum(BmSubContract bmSubContract) {
Map<String, Object> map = new HashMap<>();
Integer perNum = pmProjectMapper.getPeoNum(bmSubContract);
map.put("perNum",perNum);
return map;
}
}

5
bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmSubTeamContractServiceImpl.java
View File

@ -2,7 +2,6 @@ package com.bonus.bmw.service.impl;
import com.bonus.bmw.domain.dto.FileBasicMsgDto;
import com.bonus.bmw.domain.dto.WebFileDto;
import com.bonus.bmw.domain.po.BmSubContract;
import com.bonus.bmw.domain.po.PmSubTeamContract;
import com.bonus.bmw.domain.vo.PmWorker;
import com.bonus.bmw.mapper.PmSubTeamContractMapper;
@ -98,9 +97,9 @@ public class PmSubTeamContractServiceImpl implements PmSubTeamContractService {
}
@Override
public Map<String, Object> getPeoNum(BmSubContract bmSubContract) {
public Map<String, Object> getPeoNum(PmSubTeamContract pmSubTeamContract) {
Map<String, Object> map = new HashMap<>();
Integer perNum = pmSubTeamContractMapper.countProNum(bmSubContract);
Integer perNum = pmSubTeamContractMapper.countProNum(pmSubTeamContract);
map.put("perNum",perNum);
return map;
}

4
bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/BmSubContractMapper.xml
View File

@ -102,10 +102,10 @@
pstc.sub_id as subId
from pm_sub_team_contract pstc
left join bm_sub_contract bsc on bsc.sub_id = pstc.sub_id and bsc.pro_id = pstc.pro_id
where bsc.id = #{id}
where bsc.id = #{id} and pstc.team_ein_status=1
</select>
<select id="countTeamNum" resultType="java.lang.Integer">
select count(1) from pm_sub_team where is_active='1' and sub_id = #{subId} and ein_status=2
select count(1) from pm_sub_team_contract where is_active='1' and sub_id = #{subId} and team_ein_status = 1
</select>
<select id="countProNum" resultType="java.lang.Integer">
select count(1) from bm_worker_ein_pro_record where is_active='1' and sub_id = #{subId} and ein_status!=2

2
bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmOrgMapper.xml
View File

@ -18,7 +18,7 @@
is_enable=#{isEnable},
</if>
<if test="updateUser!= null and updateUser != ''" >
is_enable=#{updateUser},
update_user=#{updateUser},
</if>
<if test="updateTime!= null " >
update_time=#{updateTime},

3
bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmProjectMapper.xml
View File

@ -175,4 +175,7 @@
from pm_project pp
where pp.is_active = '1'
</select>
<select id="getPeoNum" resultType="java.lang.Integer">
select count(1) from bm_worker_ein_pro_record where is_active='1' and pro_id = #{proId} and ein_status!=2
</select>
</mapper>