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

包头bug修改

Browse Source
This commit is contained in:
guoshengxiong 2025-04-02 19:38:44 +08:00
parent 0bb5257904
commit 29d3ae7da5
8 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/zhgd/xmgl/modules/baotou/plan/controller/PlanRecordController.java
View File

@ -1,6 +1,7 @@
package com.zhgd.xmgl.modules.baotou.plan.controller;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@ -20,6 +21,7 @@ import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang3.StringUtils;
import org.simpleframework.xml.core.Validate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;

6
src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/HeightPermitServiceImpl.java
View File

@ -177,7 +177,7 @@ public class HeightPermitServiceImpl extends ServiceImpl<HeightPermitMapper, Hei
" \"constructionLocation\": \"${field7121456954522}\",\n" +
" \"workContent\": \"${field1945156956202}\",\n" +
" \"workHeight\": \"${field9112056958015}\",\n" +
" \"workCategory\": \"${field3453656966446}\",\n" +
" \"workCategory\": \"${field7477490129866}\",\n" +
" \"workerTimeInterval\": \"${field7139156976156}\",\n" +
" \"supplementaryMeasure\": \"${field2309857883894}\",\n" +
" \"applicantTeamLeader\": \"${field3851096669116}\",\n" +
@ -205,7 +205,9 @@ public class HeightPermitServiceImpl extends ServiceImpl<HeightPermitMapper, Hei
e.setConstructionLocation(FlowUtil.getString(formData, "constructionLocation"));
e.setWorkContent(FlowUtil.getString(formData, "workContent"));
e.setWorkHeight(FlowUtil.getString(formData, "workHeight"));
e.setWorkCategory(FlowUtil.getPullDownInteger(formData, "workCategory"));
//1:一级（2-5m）;2:二级(5-15m);3:三级(15-30m);4:特级(>30m);5:特殊;
List<String> wc = Arrays.asList("一级（2-5m）", "二级(5-15m)", "三级(15-30m)", "特级(>30m)", "特殊");
e.setWorkCategory(wc.indexOf(MapUtils.getString(formData, "workCategory")) + 1);
e.setWorker(FlowUtil.getPullDownManyStr(formData, "field7272856970526"));
e.setWorkerTimeBegin(FlowUtil.getStartDate(formData, "workerTimeInterval"));
e.setWorkerTimeEnd(FlowUtil.getEndDate(formData, "workerTimeInterval"));

2
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SystemUserController.java
View File

@ -249,8 +249,6 @@ public class SystemUserController {
})
@PostMapping(value = "/getProjectChilderSystemUserList")
public Result<List<SystemUser>> getProjectChilderSystemUserList(@RequestBody Map<String, Object> map) {
//项目子账号只能看自己创建的下面级别的账号
limitLowerSubAccount(map);
return Result.success(systemUserService.getProjectChildernSystemUserList(map));
}

6
src/main/java/com/zhgd/xmgl/modules/concrete/controller/ConcreteMonitorCurrentDataController.java
View File

@ -165,11 +165,7 @@ public class ConcreteMonitorCurrentDataController {
@ApiOperation(value = "编辑混凝土监测-实时数据", notes = "编辑混凝土监测-实时数据", httpMethod = "POST")
@PostMapping(value = "/manual/edit")
public Result editByManual(@RequestBody ConcreteMonitorCurrentDataVo vo) {
concreteMonitorCurrentDataService.remove(new LambdaQueryWrapper<ConcreteMonitorCurrentData>()
.eq(ConcreteMonitorCurrentData::getDevSn, vo.getDevSn())
.eq(ConcreteMonitorCurrentData::getReceiveTime, vo.getReceiveTime())
);
this.addByManual(vo);
concreteMonitorCurrentDataService.editByManual(vo);
return Result.ok();
}
}

2
src/main/java/com/zhgd/xmgl/modules/concrete/service/IConcreteMonitorCurrentDataService.java
View File

@ -36,4 +36,6 @@ public interface IConcreteMonitorCurrentDataService extends IService<ConcreteMon
void addDataFromTcpForLianRuiKe(String str);
IPage<BaotouConcreteMonitorCurrentDataVo> queryPageList(HashMap<String, Object> param);
void editByManual(ConcreteMonitorCurrentDataVo vo);
}

15
src/main/java/com/zhgd/xmgl/modules/concrete/service/impl/ConcreteMonitorCurrentDataServiceImpl.java
View File

@ -26,10 +26,8 @@ import com.zhgd.xmgl.modules.concrete.mapper.ConcreteMonitorDevMapper;
import com.zhgd.xmgl.modules.concrete.mapper.ConcreteMonitorDevPointPositionMapper;
import com.zhgd.xmgl.modules.concrete.service.IConcreteMonitorAlarmService;
import com.zhgd.xmgl.modules.concrete.service.IConcreteMonitorCurrentDataService;
import com.zhgd.xmgl.util.DateUtils;
import com.zhgd.xmgl.util.MapBuilder;
import com.zhgd.xmgl.util.MessageUtil;
import com.zhgd.xmgl.util.PageUtil;
import com.zhgd.xmgl.modules.xz.entity.XzLiveScreenProgram;
import com.zhgd.xmgl.util.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.MapUtils;
import org.springframework.beans.factory.annotation.Autowired;
@ -186,6 +184,7 @@ public class ConcreteMonitorCurrentDataServiceImpl extends ServiceImpl<ConcreteM
public IPage<BaotouConcreteMonitorCurrentDataVo> queryPageList(HashMap<String, Object> param) {
Page<BaotouConcreteMonitorCurrentDataVo> page = PageUtil.getPage(param);
QueryWrapper<BaotouConcreteMonitorCurrentDataVo> queryWrapper = QueryGenerator.initPageQueryWrapper(BaotouConcreteMonitorCurrentDataVo.class, param, true);
queryWrapper.orderByDesc(RefUtil.fieldNameUlc(BaotouConcreteMonitorCurrentDataVo::getReceiveTime));
IPage<BaotouConcreteMonitorCurrentDataVo> pageList = baseMapper.queryList(page, queryWrapper, param);
List<BaotouConcreteMonitorCurrentDataVo> records = pageList.getRecords();
if (CollUtil.isNotEmpty(records)) {
@ -207,4 +206,12 @@ public class ConcreteMonitorCurrentDataServiceImpl extends ServiceImpl<ConcreteM
pageList.setRecords(records);
return pageList;
}
@Override
public void editByManual(ConcreteMonitorCurrentDataVo vo) {
List<ConcreteMonitorCurrentData> list = vo.getList();
for (ConcreteMonitorCurrentData data : list) {
this.updateById(data);
}
}
}

2
src/main/java/com/zhgd/xmgl/modules/exam/controller/ExamQuestionBankController.java
View File

@ -1,5 +1,6 @@
package com.zhgd.xmgl.modules.exam.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
@ -30,6 +31,7 @@ import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.collections.list.PredicatedList;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;

2
src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml
View File

@ -36,6 +36,7 @@
,if(a.person_type=1,b.id,c.id) as post_work_type_id
,pg.project_group_name
,ei1.enterprise_name as epc_cbs_name
,pco.classification_name as branch_name
from worker_info a
LEFT JOIN team_info b ON a.team_id = b.id
LEFT JOIN department_info c ON a.department_id = c.id
@ -46,6 +47,7 @@
LEFT JOIN worker_attendance_presence wap ON wap.person_sn = a.person_sn
LEFT JOIN project_group pg on pg.id=a.project_group
LEFT JOIN enterprise_info ei1 on ei1.id=a.epc_cbs
LEFT JOIN party_construction_organization pco on pco.id=a.branch_id
<if test="param.attendance == '1'.toString()">
join (select * from worker_attendance where
1=1