admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

包头bug修复

Browse Source
This commit is contained in:
guoshengxiong 2025-01-14 10:16:05 +08:00
parent 9b085f1e7e
commit 4f6849f81b
10 changed files with 159 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/main/java/com/zhgd/xmgl/modules/baotou/controller/DeviceUnitController.java
View File

@ -1,26 +1,24 @@
package com.zhgd.xmgl.modules.baotou.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.zhgd.annotation.OperLog;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiImplicitParams;
import java.util.HashMap;
import springfox.documentation.annotations.ApiIgnore;
import java.util.List;
import com.zhgd.jeecg.common.api.vo.Result;
import org.apache.commons.collections.MapUtils;
import com.zhgd.xmgl.modules.baotou.entity.DeviceUnit;
import com.zhgd.xmgl.modules.baotou.service.IDeviceUnitService;
import org.simpleframework.xml.core.Validate;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.zhgd.xmgl.modules.worker.entity.EnterpriseInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.MapUtils;
import org.simpleframework.xml.core.Validate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import java.util.HashMap;
import java.util.List;
/**
@ -40,6 +38,7 @@ public class DeviceUnitController {
/**
* 分页列表查询
*
* @return
*/
@OperLog(operModul = "装置管理管理", operType = "分页查询", operDesc = "分页列表查询装置管理信息")
@ -56,6 +55,7 @@ public class DeviceUnitController {
/**
* 列表查询
*
* @return
*/
@OperLog(operModul = "装置管理管理", operType = "列表查询", operDesc = "列表查询装置管理信息")
@ -67,6 +67,7 @@ public class DeviceUnitController {
/**
* 添加
*
* @param deviceUnit
* @return
*/
@ -80,6 +81,7 @@ public class DeviceUnitController {
/**
* 编辑
*
* @param deviceUnit
* @return
*/
@ -93,6 +95,7 @@ public class DeviceUnitController {
/**
* 通过id删除
*
* @return
*/
@OperLog(operModul = "装置管理管理", operType = "删除", operDesc = "删除装置管理信息")
@ -106,6 +109,7 @@ public class DeviceUnitController {
/**
* 通过id查询
*
* @param id
* @return
*/
@ -117,4 +121,16 @@ public class DeviceUnitController {
return Result.success(deviceUnitService.queryById(id));
}
@OperLog(operModul = "装置管理管理", operType = "", operDesc = "根据施工或epc单位查询epc承包商列表")
@ApiOperation(value = "根据施工或epc单位查询epc承包商列表", notes = "根据施工或epc单位查询epc承包商列表", httpMethod = "GET")
@ApiImplicitParams({
@ApiImplicitParam(name = "enterpriseId", value = "单位ID", paramType = "query", required = true, dataType = "String"),
@ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "query", required = true, dataType = "String"),
})
@GetMapping(value = "/getEpcList")
public Result<List<EnterpriseInfo>> getEpcList(@ApiIgnore @RequestParam HashMap<String, Object> map) {
return Result.success(deviceUnitService.getEpcList(map));
}
}

3
src/main/java/com/zhgd/xmgl/modules/baotou/mapper/DeviceUnitMapper.java
View File

@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zhgd.annotation.DataScope;
import com.zhgd.xmgl.modules.worker.entity.EnterpriseInfo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import com.zhgd.xmgl.modules.baotou.entity.DeviceUnit;
@ -28,4 +29,6 @@ public interface DeviceUnitMapper extends BaseMapper<DeviceUnit> {
IPage<DeviceUnit> queryList(Page<DeviceUnit> page, @Param(Constants.WRAPPER) QueryWrapper<DeviceUnit> queryWrapper,@Param("param") HashMap<String, Object> param);
List<Long> getEpcUserIds(@Param("list") List<Long> eids);
List<EnterpriseInfo> getEpcList(HashMap<String, Object> param);
}

9
src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/DeviceUnitMapper.xml
View File

@ -63,4 +63,13 @@
find_in_set(#{item},pgu.construction_unit_ids)
</foreach>
</select>
<select id="getEpcList" resultType="com.zhgd.xmgl.modules.worker.entity.EnterpriseInfo">
select
distinct ei.*
from enterprise_info ei
join device_unit du on find_in_set(ei.id,du.epc_contractor_ids)
where du.project_sn=#{projectSn}
and find_in_set(#{enterpriseId},du.construction_unit_ids)
</select>
</mapper>

3
src/main/java/com/zhgd/xmgl/modules/baotou/service/IDeviceUnitService.java
View File

@ -3,6 +3,8 @@ package com.zhgd.xmgl.modules.baotou.service;
import com.zhgd.xmgl.modules.baotou.entity.DeviceUnit;
import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.zhgd.xmgl.modules.worker.entity.EnterpriseInfo;
import java.util.HashMap;
import java.util.List;
@ -52,4 +54,5 @@ public interface IDeviceUnitService extends IService<DeviceUnit> {
List<Long> getEpcUserIds(List<Long> constructUserIds);
List<EnterpriseInfo> getEpcList(HashMap<String, Object> param);
}

25
src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/DeviceUnitServiceImpl.java
View File

@ -8,16 +8,22 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zhgd.jeecg.common.execption.OpenAlertException;
import com.zhgd.jeecg.common.system.query.QueryGenerator;
import com.zhgd.xmgl.constant.Cts;
import com.zhgd.xmgl.modules.baotou.entity.DeviceUnit;
import com.zhgd.xmgl.modules.baotou.entity.ProjectGroupUnit;
import com.zhgd.xmgl.modules.baotou.entity.UserDevGroup;
import com.zhgd.xmgl.modules.baotou.mapper.DeviceUnitMapper;
import com.zhgd.xmgl.modules.baotou.service.IDeviceUnitService;
import com.zhgd.xmgl.modules.baotou.service.IProjectGroupUnitService;
import com.zhgd.xmgl.modules.baotou.service.IUserDevGroupService;
import com.zhgd.xmgl.modules.worker.entity.EnterpriseInfo;
import com.zhgd.xmgl.modules.worker.entity.WorkerInfo;
import com.zhgd.xmgl.modules.worker.service.impl.EnterpriseInfoServiceImpl;
import com.zhgd.xmgl.modules.worker.service.impl.WorkerInfoServiceImpl;
import com.zhgd.xmgl.security.entity.UserInfo;
import com.zhgd.xmgl.security.util.SecurityUtils;
import com.zhgd.xmgl.util.PageUtil;
import org.apache.commons.collections.MapUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
@ -33,6 +39,8 @@ import java.util.stream.Collectors;
*/
@Service
public class DeviceUnitServiceImpl extends ServiceImpl<DeviceUnitMapper, DeviceUnit> implements IDeviceUnitService {
@Autowired
IProjectGroupUnitService projectGroupUnitService;
@Autowired
private DeviceUnitMapper deviceUnitMapper;
@Lazy
@ -41,6 +49,8 @@ public class DeviceUnitServiceImpl extends ServiceImpl<DeviceUnitMapper, DeviceU
@Lazy
@Autowired
private WorkerInfoServiceImpl workerInfoService;
@Autowired
private EnterpriseInfoServiceImpl enterpriseInfoService;
@Override
public IPage<DeviceUnit> queryPageList(HashMap<String, Object> param) {
@ -140,4 +150,19 @@ public class DeviceUnitServiceImpl extends ServiceImpl<DeviceUnitMapper, DeviceU
return baseMapper.getEpcUserIds(eids);
}
@Override
public List<EnterpriseInfo> getEpcList(HashMap<String, Object> param) {
String enterpriseId = MapUtils.getString(param, "enterpriseId");
String projectSn = MapUtils.getString(param, "projectSn");
List<DeviceUnit> groupUnits = baseMapper.selectList(new LambdaQueryWrapper<DeviceUnit>()
.apply("find_in_set({0}, epc_contractor_ids)", enterpriseId)
.eq(DeviceUnit::getProjectSn, projectSn)
.last(Cts.IGNORE_DATA_SCOPE_CONDITION)
);
if (CollUtil.isNotEmpty(groupUnits)) {
return Collections.singletonList(enterpriseInfoService.getOne(new LambdaQueryWrapper<EnterpriseInfo>()
.eq(EnterpriseInfo::getId, enterpriseId).last(Cts.IGNORE_DATA_SCOPE_CONDITION)));
}
return baseMapper.getEpcList(param);
}
}

4
src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/WorkerAdmissionServiceImpl.java
View File

@ -184,10 +184,10 @@ public class WorkerAdmissionServiceImpl extends ServiceImpl<WorkerAdmissionMappe
Long epcCbs = FlowUtil.getPullDownLong(m, "field4614421102325");
Long enterpriseId = FlowUtil.getPullDownLong(m, "field9875821081899");
Long workArea = FlowUtil.getPullDownLong(m, "field5965220675871");
Integer sex = FlowUtil.getPullDownInteger(m, "field6935200407637");
Map<String, String> idCardMap = IdCardUtils.getBirthdayAgeSex(idCard);
Integer sex = Integer.valueOf(idCardMap.get("sex"));
Integer isCertificateQualified = FlowUtil.getPullDownInteger(m, "field1062926653275");
String random = IdUtil.simpleUUID();
Map<String, String> idCardMap = IdCardUtils.getBirthdayAgeSex(idCard);
WorkerAdmissionDetail detail = new WorkerAdmissionDetail();
detail.setNum(num);
detail.setWorkerName(workerName);

2
src/main/java/com/zhgd/xmgl/modules/basicdata/entity/BaseModule.java
View File

@ -51,7 +51,7 @@ public class BaseModule implements Serializable {
@ApiModelProperty(value="是否设备中台模块，0否，1是")
private java.lang.Integer moduleEquipment;
@ApiModelProperty(value = "模块类型，1企业模块，2项目后台模块，3企业后台，4项目看板，5项目前台，6供应商")
@ApiModelProperty(value = "模块类型，1:企业前台;2:项目后台;3:企业后台;4:项目看板;5:项目前台;6:供应商管理;7:工作台;8:新项目看板;9:系统管理;")
private java.lang.Integer moduleType ;
/**图标*/
@Excel(name = "图标", width = 15)

6
src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendanceServiceImpl.java
View File

@ -382,7 +382,7 @@ public class WorkerAttendanceServiceImpl extends ServiceImpl<WorkerAttendanceMap
map1.put("heads", heads1);
map1.put("headsStr", headsStr1);
map1.put("dataList", list);
map1.put("sheetName", MapUtils.getString(map, "monthTime") + "单位工时汇总");
map1.put("sheetName", "数据");
List<Map<String, Object>> sheetList = new ArrayList<>();
sheetList.add(map1);
@ -408,7 +408,7 @@ public class WorkerAttendanceServiceImpl extends ServiceImpl<WorkerAttendanceMap
} else {
d = NumberUtil.add(d, min);
}
dataList4Map.put("enterpriseName", d);
dataList4Map.put(enterpriseName, d);
}
List<Map<String, Object>> dataList4 = dataList4Map.entrySet().stream().map(o -> {
Map<String, Object> m = new HashMap<>();
@ -428,7 +428,7 @@ public class WorkerAttendanceServiceImpl extends ServiceImpl<WorkerAttendanceMap
Map<String, Object> map2 = new HashMap<>(16);
map2.put("heads", heads2);
map2.put("headsStr", headsStr2);
map2.put("dataList", list);
map2.put("dataList", dataList4);
map2.put("sheetName", "单位工时汇总");
sheetList.add(map2);
JxlExcelUtils.excelManySheetExport("考勤明细列表", sheetList, response);

2
src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerMonthAttendanceStatisticsServiceImpl.java
View File

@ -492,7 +492,7 @@ public class WorkerMonthAttendanceStatisticsServiceImpl extends ServiceImpl<Work
} else {
d = NumberUtil.add(d, min);
}
dataList4Map.put("enterpriseName", d);
dataList4Map.put(enterpriseName, d);
}
List<Map<String, Object>> dataList4 = dataList4Map.entrySet().stream().map(o -> {
Map<String, Object> m = new HashMap<>();

15
src/main/java/com/zhgd/xmgl/util/FlowSeviceUtil.java
View File

@ -21,6 +21,7 @@ import com.wflow.workflow.UELTools;
import com.wflow.workflow.bean.dto.ProcessInstanceOwnerDto;
import com.wflow.workflow.bean.process.OrgUser;
import com.wflow.workflow.bean.process.ProcessNode;
import com.wflow.workflow.bean.process.ProcessStatus;
import com.wflow.workflow.bean.process.enums.ApprovalModeEnum;
import com.wflow.workflow.bean.process.enums.NodeTypeEnum;
import com.wflow.workflow.bean.process.props.ApprovalProps;
@ -436,8 +437,8 @@ public class FlowSeviceUtil {
vo.setCsMe((int) processService.getCcMeInstance(1, 1, null, null, null, null, null).getTotal());
//查询待催办、已办结
vo.setNeedCall((int) getTaskNum(userId, false).count());
vo.setDone((int) getTaskNum(userId, true).count());
vo.setNeedCall((int) getTaskNum(userId, 1).count());
vo.setDone((int) getTaskNum(userId, 2).count());
return vo;
}
@ -445,13 +446,15 @@ public class FlowSeviceUtil {
* 查询任务数量
*
* @param userId
* @param finished
* @param customStatus 1待催办2已办结（只有PASS）
* @return
*/
private HistoricProcessInstanceQuery getTaskNum(String userId, boolean finished) {
private HistoricProcessInstanceQuery getTaskNum(String userId, Integer customStatus) {
HistoricProcessInstanceQuery instanceQuery = historyService.createHistoricProcessInstanceQuery();
instanceQuery.processInstanceTenantId(TenantContextHolder.getTenantId());
Executor.builder()
.ifNotBlankNext(Objects.equals(customStatus, 1) ? "PRE_%" : null, instanceQuery::processInstanceBusinessStatusLike)
.ifNotBlankNext(Objects.equals(customStatus, 2) ? ProcessStatus.PASS.toString() : null, instanceQuery::processInstanceBusinessStatus)
.ifNotBlankNext(userId, instanceQuery::involvedUser)
// .ifNotBlankNext(startUser, instanceQuery::startedBy)
// .ifNotBlankNext(code, instanceQuery::processDefinitionKey)
@ -460,8 +463,8 @@ public class FlowSeviceUtil {
// instanceQuery.startedBefore(DateUtil.parse(startTimes[1]));
// })
// .ifNotBlankNext(keyword, v -> instanceQuery.processInstanceNameLike(StrUtil.format("%{}%", keyword)))
.ifTrueNext(Boolean.TRUE.equals(finished), instanceQuery::finished)
.ifTrueNext(Boolean.FALSE.equals(finished), instanceQuery::unfinished)
// .ifTrueNext(Boolean.TRUE.equals(finished), instanceQuery::finished)
// .ifTrueNext(Boolean.FALSE.equals(finished), instanceQuery::unfinished)
// .ifNotBlankNext(fieldId, id -> {
// if (StrUtil.isBlank(code)){
// throw new BusinessException("搜索表单值必须先指定表单流程类型");