Skip to content

张雷 / skboot-zhongye

转到一个项目
切换导航栏
切换导航栏固定状态
d6ca71fe 由 张雷
选项

安环禅道问题修改

1 个父辈 beb320ec
内嵌 并排
正在显示 18 个修改的文件 包含 179 行增加 和 117 行删除
sk-module-biz/src/main/java/com/skua/modules/ajh/entity/AjhExerciseSituation.java
......@@ -103,4 +103,13 @@ public class AjhExerciseSituation {
@Excel(name = "标识", width = 15)
@ApiModelProperty(value = "标识")
private Integer delFlag;
/**应急预案*/
@Excel(name = "应急预案", width = 15)
@ApiModelProperty(value = "应急预案")
@Dict(dictTable = "emergency_plan_database", dicCode="id", dicText = "doc_name")
private String emergencyPlan;
/**应急评估*/
@Excel(name = "应急评估", width = 15)
@ApiModelProperty(value = "应急评估")
private String exeAssessment;
}
......
sk-module-biz/src/main/java/com/skua/modules/emergency/controller/EmergencyAnalysisController.java
......@@ -97,66 +97,32 @@ public class EmergencyAnalysisController {
/**
* @param req
* 应急资源统计
* @param departId
* @return
*/
@AutoLog(value = "应急-应急资源统计")
@ApiOperation(value = "应急-应急资源统计", notes = "应急-应急资源统计")
@GetMapping(value = "/resource")
public Result resource(
HttpServletRequest req, String moduleType) {
public Result resource(String moduleType,String departId) {
Result result = new Result<>();
try {
ArrayList<Object> resultList = new ArrayList<>();
// String moduleType = req.getParameter("moduleType");
QueryWrapper<EmergencyGoods> emergencyGoodsQueryWrapper = new QueryWrapper<EmergencyGoods>()
.select("id,goods_type as goodsType,goods_name as goodsName,goods_unit as goodsUnit,sum(goods_num)as totalGoods")
.eq("del_flag", 1).groupBy("goods_name");
.eq(StringUtils.isNotEmpty(moduleType),"module_type", moduleType)
.eq(StringUtils.isNotEmpty(departId),"depart_id", departId)
.eq("del_flag", 1)
.groupBy("goods_name");
List<Map<String, Object>> totalGoodsList = goodsService.listMaps(emergencyGoodsQueryWrapper);
//应急事件
QueryWrapper<EmergencyEvents> emergencyEventsQueryWrapper = new QueryWrapper<>();
emergencyEventsQueryWrapper.eq("del_flag", 1).isNotNull("process_instance_id");
List<EmergencyEvents> eventsList = emergencyEventsService.list(emergencyEventsQueryWrapper);
//待处理
List<EmergencyEvents> processEventsList = eventsList.stream().filter(events -> StringUtils.isNotBlank(events.getProcessInstanceId())).collect(Collectors.toList());
Set<String> processInstanceIdS = processEventsList.stream().map(events -> events.getProcessInstanceId()).collect(Collectors.toSet());
// Map<String,Map<String, String>> processStateMap = flowBusinessService.getProcessState(processInstanceIdS);
// for (EmergencyEvents events : eventsList) {
// events.setProcessState(processStateMap.get(events.getProcessInstanceId()).getOrDefault("state", "pending"));
// }
// //处理中事件
// List<EmergencyEvents> unfinishedEvents = eventsList.stream().filter(events -> "unfinished".equals(events.getProcessState())).collect(Collectors.toList());
QueryWrapper<EmergencyCarts> emergencyCartsQueryWrapper = new QueryWrapper<EmergencyCarts>().eq("del_flag", 1);
int totalCarts = emergencyCartsService.count(emergencyCartsQueryWrapper);
for (Map<String, Object> goodsMap : totalGoodsList) {
Double inUseNum = 0.0;
// if (!CollectionUtils.isEmpty(unfinishedEvents)) {
// for (EmergencyEvents emergencyEvents : unfinishedEvents) {
// String eventId = emergencyEvents.getId();
// List<EmergencyEventsGoods> emergencyEventsGoods = emergencyEventsGoodsService.list(new QueryWrapper<EmergencyEventsGoods>().eq("event_id", eventId));
// if (!CollectionUtils.isEmpty(emergencyEventsGoods)) {
// for (EmergencyEventsGoods emergencyEventsGood : emergencyEventsGoods) {
// if (emergencyEventsGood.getGoodsId().equals(goodsMap.get("id"))) {
// inUseNum += emergencyEventsGood.getUseNum();
// }
// }
// }
// }
// }
goodsMap.put("inUseNum", inUseNum);
goodsMap.put("freeNum", Double.parseDouble(String.valueOf(goodsMap.get("totalGoods"))) - inUseNum>0?Double.parseDouble(String.valueOf(goodsMap.get("totalGoods"))) - inUseNum:0);
}
int useCartNum = 0;
// if (!CollectionUtils.isEmpty(unfinishedEvents)) {
// for (EmergencyEvents emergencyEvents : unfinishedEvents) {
// String eventId = emergencyEvents.getId();
// List<EmergencyEventsCart> emergencyEventsCarts = emergencyEventsCartService.list(new QueryWrapper<EmergencyEventsCart>().eq("event_id", eventId));
// useCartNum += emergencyEventsCarts.size();
// }
// }
HashMap<String, Object> map = new HashMap<>();
map.put("goodsName", "应急车辆");
map.put("goodsUnit", "辆");
......
sk-module-biz/src/main/java/com/skua/modules/emergency/controller/EmergencyCommandLiaisonController.java
......@@ -79,11 +79,10 @@ public class EmergencyCommandLiaisonController {
@AutoLog(value = "应急指挥联络图-树结构数据")
@ApiOperation(value="应急指挥联络图-树结构数据", notes="应急指挥联络图-树结构数据")
@GetMapping(value = "/queryTreeList")
public Result<List<EmergencyCommandLiaisonTreeModel>> queryTreeList(EmergencyCommandLiaison emergencyCommandLiaison,HttpServletRequest request) {
public Result<List<EmergencyCommandLiaisonTreeModel>> queryTreeList(EmergencyCommandLiaison emergencyCommandLiaison) {
Result<List<EmergencyCommandLiaisonTreeModel>> result = new Result<>();
try {
List<EmergencyCommandLiaisonTreeModel> list = emergencyCommandLiaisonService.queryTreeList( emergencyCommandLiaison);
List<EmergencyCommandLiaisonTreeModel> list = emergencyCommandLiaisonService.queryTreeList(emergencyCommandLiaison);
result.setResult(list);
result.setSuccess(true);
} catch (Exception e) {
......
sk-module-biz/src/main/java/com/skua/modules/emergency/controller/EmergencyPlanDatabaseController.java
......@@ -78,6 +78,26 @@ public class EmergencyPlanDatabaseController {
}
/**
* 下拉列表
* @param departId
* @return
*/
@AutoLog(value = "应急预案资料库-下拉列表查询")
@ApiOperation(value = "应急预案资料库-下拉列表查询", notes = "应急预案资料库-下拉列表查询")
@GetMapping(value = "/get")
public Result<List<EmergencyPlanDatabase>> getList(String departId) {
Result<List<EmergencyPlanDatabase>> result = new Result<List<EmergencyPlanDatabase>>();
QueryWrapper<EmergencyPlanDatabase> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("doc_type", "2");
queryWrapper.eq(StringUtils.isNotEmpty(departId), "depart_id", departId);
queryWrapper.orderByDesc("create_time");
List<EmergencyPlanDatabase> list = emergencyPlanDatabaseService.list(queryWrapper);
result.setSuccess(true);
result.setResult(list);
return result;
}
/**
* 列表查询
*
* @param emergencyPlanDatabase
......
sk-module-biz/src/main/java/com/skua/modules/emergency/entity/EmergencyCommandLiaison.java
......@@ -40,6 +40,15 @@ public class EmergencyCommandLiaison {
@Excel(name = "地址", width = 15)
@ApiModelProperty(value = "地址")
private String address;
/**所属厂区*/
@Excel(name = "所属厂区", width = 15)
@ApiModelProperty(value = "所属厂区")
private String departId;
/**版块类型:1-河道,2-污水厂,3-排水管网*/
@Excel(name = "版块类型:1-河道,2-污水厂,3-排水管网", width = 15)
@ApiModelProperty(value = "版块类型:1-河道,2-污水厂,3-排水管网")
@Dict(dicCode = "moduleType")
private String moduleType;
/**备注*/
@Excel(name = "备注", width = 15)
@ApiModelProperty(value = "备注")
......@@ -85,10 +94,4 @@ public class EmergencyCommandLiaison {
@Excel(name = "attr4", width = 15)
@ApiModelProperty(value = "attr4")
private String attr4;
/**版块类型:1-河道,2-污水厂,3-排水管网*/
@Excel(name = "版块类型:1-河道,2-污水厂,3-排水管网", width = 15)
@ApiModelProperty(value = "版块类型:1-河道,2-污水厂,3-排水管网")
@Dict(dicCode = "moduleType")
private String moduleType;
}
......
sk-module-biz/src/main/java/com/skua/modules/emergency/entity/EmergencyGoods.java
......@@ -90,6 +90,13 @@ public class EmergencyGoods {
@ApiModelProperty(value = "联系方式")
private String phoneNumber;
/**
* 所属厂区
*/
@Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name")
@Excel(name = "所属厂区", width = 15)
@ApiModelProperty(value = "所属厂区")
private String departId;
/**
* 创建人
*/
@Dict(dicCode = "id", dictTable = "sys_user", dicText = "realname")
......
sk-module-biz/src/main/java/com/skua/modules/emergency/entity/EmergencyPlanDatabase.java
......@@ -69,73 +69,93 @@ public class EmergencyPlanDatabase{
@Excel(name = "备注", width = 15)
@ApiModelProperty(value = "备注")
private String remark;
/**发布时间*/
@Excel(name = "发布时间", width = 15)
@ApiModelProperty(value = "发布时间")
private String releaseTime;
/**有效时间*/
@Excel(name = "有效时间", width = 15)
@ApiModelProperty(value = "有效时间")
private String effectiveTime;
/**发布时间*/
@Excel(name = "发布时间", width = 15)
@ApiModelProperty(value = "发布时间")
private String isLocalFiling;
/**预案类型*/
@Excel(name = "预案类型", width = 15)
@ApiModelProperty(value = "预案类型")
@Dict(dicCode = "plan_type")
private String planType;
/**应用类型*/
@Excel(name = "应用类型", width = 15)
@ApiModelProperty(value = "应用类型")
@Dict(dicCode = "application_type")
private String applicationType;
/**版本号*/
@Excel(name = "版本号", width = 15)
@ApiModelProperty(value = "版本号")
private String fileVersion;
/**所属部门*/
@Excel(name = "所属部门", width = 15)
@ApiModelProperty(value = "所属部门")
private String fileDepart;
/**修订过程*/
@Excel(name = "修订过程", width = 15)
@ApiModelProperty(value = "修订过程")
private String updateHistory;
/**风险分布文件*/
@Excel(name = "riskFile", width = 15)
@ApiModelProperty(value = "riskFile")
private String riskFile;
/**图片1名称*/
@Excel(name = "图片1名称", width = 15)
@ApiModelProperty(value = "图片1名称")
private String riskFileName;
/**应急疏散线路文件*/
@Excel(name = "evacuateFile", width = 15)
@ApiModelProperty(value = "evacuateFile")
private String evacuateFile;
/**图片2名称*/
@Excel(name = "图片2名称", width = 15)
@ApiModelProperty(value = "图片2名称")
private String evacuateFileName;
/**上传人*/
@Excel(name = "上传人", width = 15)
@ApiModelProperty(value = "上传人")
@ApiModelProperty(value = "上传人")
@Dict(dicCode = "username",dictTable = "sys_user",dicText = "realname")
private String createBy;
/**上传时间*/
@Excel(name = "上传时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "上传时间")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "上传时间")
private java.util.Date createTime;
/**更新人*/
@Excel(name = "更新人", width = 15)
@ApiModelProperty(value = "更新人")
@ApiModelProperty(value = "更新人")
private String updateBy;
/**更新时间*/
@Excel(name = "更新时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新时间")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新时间")
private java.util.Date updateTime;
/**createDept*/
@Excel(name = "createDept", width = 15)
@ApiModelProperty(value = "createDept")
@ApiModelProperty(value = "createDept")
private String createDept;
/**createCmpy*/
@Excel(name = "createCmpy", width = 15)
@ApiModelProperty(value = "createCmpy")
@ApiModelProperty(value = "createCmpy")
private String createCmpy;
/**delFlag*/
@Excel(name = "delFlag", width = 15)
@ApiModelProperty(value = "delFlag")
@ApiModelProperty(value = "delFlag")
private Integer delFlag;
/**release_time*/
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "发布时间")
private java.util.Date releaseTime;
/**attr2*/
@Excel(name = "attr2", width = 15)
@ApiModelProperty(value = "attr2")
private String attr2;
/**attr3*/
@Excel(name = "attr3", width = 15)
@ApiModelProperty(value = "attr3")
private String attr3;
/**attr4*/
@Excel(name = "attr4", width = 15)
@ApiModelProperty(value = "attr4")
private String attr4;
/**风险分布文件*/
@Excel(name = "riskFile", width = 15)
@ApiModelProperty(value = "riskFile")
private String riskFile;
/**应急疏散线路文件*/
@Excel(name = "evacuateFile", width = 15)
@ApiModelProperty(value = "evacuateFile")
private String evacuateFile;
/**
* 流程定义id
*/
/**流程定义id */
@TableField(exist = false)
private String processDefinitionId;
/**
* 流程实例id
*/
/** 流程实例id*/
@TableField(exist = false)
private String processInstanceId;
......
sk-module-biz/src/main/java/com/skua/modules/emergency/entity/EmergencyPlanDatabaseFlow.java
......@@ -95,10 +95,9 @@ public class EmergencyPlanDatabaseFlow extends FlowEntity{
@ApiModelProperty(value = "delFlag")
private java.lang.Integer delFlag;
/**release_time*/
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "发布时间")
private java.util.Date releaseTime;
@Excel(name = "发布时间", width = 15)
@ApiModelProperty(value = "发布时间")
private String releaseTime;
/**attr2*/
@Excel(name = "attr2", width = 15)
@ApiModelProperty(value = "attr2")
......
sk-module-biz/src/main/java/com/skua/modules/emergency/mapper/EmergencyCommandLiaisonMapper.java
......@@ -19,6 +19,6 @@ public interface EmergencyCommandLiaisonMapper extends BaseMapper<EmergencyComma
* 查询联络图所有
* @return
*/
List<EmergencyCommandLiaisonVO> findList(EmergencyCommandLiaison emergencyCommandLiaison);
List<EmergencyCommandLiaisonVO> findList(@Param("emergencyCommandLiaison") EmergencyCommandLiaison emergencyCommandLiaison);
}
......
sk-module-biz/src/main/java/com/skua/modules/emergency/mapper/xml/EmergencyCommandLiaisonMapper.xml
......@@ -3,5 +3,8 @@
<mapper namespace="com.skua.modules.emergency.mapper.EmergencyCommandLiaisonMapper">
<select id="findList" resultType="com.skua.modules.emergency.vo.EmergencyCommandLiaisonVO">
select * from emergency_command_liaison
<if test="emergencyCommandLiaison.departId!=null and emergencyCommandLiaison.departId!=''">
where depart_id = #{emergencyCommandLiaison.departId}
</if>
</select>
</mapper>
......
sk-module-biz/src/main/java/com/skua/modules/emergency/model/EmergencyCommandLiaisonTreeModel.java
......@@ -37,6 +37,9 @@ public class EmergencyCommandLiaisonTreeModel implements Serializable {
/**地址*/
@ApiModelProperty(value = "地址")
private java.lang.String address;
/**所属厂区*/
@ApiModelProperty(value = "所属厂区")
private java.lang.String departId;
/**备注*/
@ApiModelProperty(value = "备注")
private java.lang.String remark;
......@@ -85,6 +88,7 @@ public class EmergencyCommandLiaisonTreeModel implements Serializable {
this.parentId = liaison.getParentId();
this.emergencyName = liaison.getEmergencyName();
this.address = liaison.getAddress();
this.departId = liaison.getDepartId();
this.remark = liaison.getRemark();
this.createBy = liaison.getCreateBy();
this.createTime = liaison.getCreateTime();
......@@ -166,6 +170,14 @@ public class EmergencyCommandLiaisonTreeModel implements Serializable {
this.address = address;
}
public String getDepartId() {
return departId;
}
public void setDepartId(String departId) {
this.departId = departId;
}
public String getRemark() {
return remark;
}
......@@ -268,6 +280,7 @@ public class EmergencyCommandLiaisonTreeModel implements Serializable {
parentId.equals(that.parentId) &&
emergencyName.equals(that.emergencyName) &&
address.equals(that.address) &&
departId.equals(that.departId) &&
remark.equals(that.remark) &&
createBy.equals(that.createBy) &&
createTime.equals(that.createTime) &&
......@@ -283,6 +296,6 @@ public class EmergencyCommandLiaisonTreeModel implements Serializable {
@Override
public int hashCode() {
return Objects.hash(key, value, title, userList, isLeaf, id, parentId, emergencyName, address, remark, createBy, createTime, updateBy, updateTime, delFlag, attr1, attr2, attr3, attr4, children);
return Objects.hash(key, value, title, userList, isLeaf, id, parentId, emergencyName, address, departId, remark, createBy, createTime, updateBy, updateTime, delFlag, attr1, attr2, attr3, attr4, children);
}
}
......
sk-module-biz/src/main/java/com/skua/modules/emergency/vo/EmergencyCommandLiaisonVO.java
......@@ -36,6 +36,10 @@ public class EmergencyCommandLiaisonVO {
@Excel(name = "地址", width = 15)
@ApiModelProperty(value = "地址")
private java.lang.String address;
/**所属厂区*/
@Excel(name = "所属厂区", width = 15)
@ApiModelProperty(value = "所属厂区")
private String departId;
/**备注*/
@Excel(name = "备注", width = 15)
@ApiModelProperty(value = "备注")
......
sk-module-biz/src/main/java/com/skua/modules/emergency/vo/EmergencyPlanDatabaseVO.java
......@@ -91,10 +91,9 @@ public class EmergencyPlanDatabaseVO{
@ApiModelProperty(value = "delFlag")
private java.lang.Integer delFlag;
/**release_time*/
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "发布时间")
private java.util.Date releaseTime;
@Excel(name = "发布时间", width = 15)
@ApiModelProperty(value = "发布时间")
private String releaseTime;
/**attr2*/
@Excel(name = "attr2", width = 15)
@ApiModelProperty(value = "attr2")
......
sk-module-equipment/src/main/java/com/skua/modules/supplies/controller/web/EquipmentSparepartSuppliesController.java
......@@ -87,7 +87,6 @@ public class EquipmentSparepartSuppliesController {
* @param equipmentSparepartSupplies
* @param pageNo
* @param pageSize
* @param req
* @return
* @author 开发者姓名, 开发时间
* @Description: TODO(这里描述这个方法的需求变更情况)
......@@ -98,8 +97,7 @@ public class EquipmentSparepartSuppliesController {
@GetMapping(value = "/list")
public Result queryPageList(EquipmentSparepartSuppliesDTO equipmentSparepartSupplies,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) throws Exception {
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) throws Exception {
Result result = new Result();
Set<String> sparepartTypeSet = new HashSet<>();
if (StringUtils.isNotEmpty(equipmentSparepartSupplies.getSparepartType())) {
......@@ -135,7 +133,6 @@ public class EquipmentSparepartSuppliesController {
.ge("storage_num", 0)
.isNotNull("storage_num")
).stream().map(EquipmentSparepart::getSuppliesId).collect(Collectors.toSet());
// 查询条件加入in条件
if (!sparepartSuppliesIdSet.isEmpty()&&sparepartSuppliesIdSet.size()>0) {
queryWrapper.in("id", sparepartSuppliesIdSet);
......@@ -148,9 +145,6 @@ public class EquipmentSparepartSuppliesController {
Page<EquipmentSparepartSupplies> page = new Page<EquipmentSparepartSupplies>(pageNo, pageSize);
//添加库存预警查询
List<EquipmentSparepartSupplies> records = equipmentSparepartSuppliesService.list(queryWrapper);
//Page<JSONObject> objectPage = new Page<>();
//BeanUtils.copyProperties(page, objectPage);
//List<EquipmentSparepartSupplies> records = pageList.getRecords();
List<EquipmentSparepartSuppliesVO> check = check(records, equipmentSparepartSupplies);
//过滤库存量预警查询
if (!StringUtils.isEmpty(equipmentSparepartSupplies.getStorageWarn())) {
......@@ -159,7 +153,6 @@ public class EquipmentSparepartSuppliesController {
List<JSONObject> jsonObjects = sysCommonDictService.translateListDictValue(check);
// 计算总数
long count = jsonObjects.size();
List list;
if (pageNo * pageSize <= jsonObjects.size()) {
list = jsonObjects.subList(ConvertUtils.getInt((pageNo - 1) * pageSize), ConvertUtils.getInt(pageNo * pageSize));
......@@ -172,7 +165,7 @@ public class EquipmentSparepartSuppliesController {
page.setTotal(count);
// 设置数据
page.setRecords(list);
result.setSuccess(true);
result.setResult(page);
return result;
......
sk-module-equipment/src/main/java/com/skua/modules/supplies/entity/EquipmentSparepartSupplies.java
......@@ -34,6 +34,13 @@ public class EquipmentSparepartSupplies {
@TableId(type = IdType.ID_WORKER_STR)
@ApiModelProperty(value = "id")
private String id;
/**所属厂区*/
@Excel(name = "所属厂区", width = 15)
@ApiModelProperty(value = "所属厂区")
@Dict(dictTable = "sys_depart", dicCode="id", dicText = "depart_name")
private String departId;
/**
* 物料编号
*/
......@@ -228,5 +235,16 @@ public class EquipmentSparepartSupplies {
@ApiModelProperty(value = "生成时间")
private Date inventoryUpdateTime;
/** 是否应急物资 */
@Excel(name = "是否应急物资", width = 15)
@ApiModelProperty(value = "是否应急物资")
@Dict(dicCode = "yn")
private String isEmergency;
/** 是否危化品 */
@Excel(name = "是否危化品", width = 15)
@ApiModelProperty(value = "是否危化品")
@Dict(dicCode = "yn")
private String isDangerous;
}
......
sk-module-equipment/src/main/java/com/skua/modules/supplies/vo/EquipmentSparepartSuppliesVO.java
......@@ -62,6 +62,10 @@ public class EquipmentSparepartSuppliesVO {
@Excel(name = "规格型号", width = 15)
@ApiModelProperty(value = "规格型号")
private String specification;
/**所属厂区*/
@ApiModelProperty(value = "所属厂区")
@Dict(dictTable = "sys_depart", dicCode="id", dicText = "depart_name")
private String departId;
/**
* 生产厂商
*/
......@@ -216,4 +220,14 @@ public class EquipmentSparepartSuppliesVO {
*/
@TableField(exist = false)
private String storageWarn;
/** 是否应急物资 */
@ApiModelProperty(value = "是否应急物资")
@Dict(dicCode = "yn")
private String isEmergency;
/** 是否危化品 */
@ApiModelProperty(value = "是否危化品")
@Dict(dicCode = "yn")
private String isDangerous;
}
......
sk-module-system/src/main/java/com/skua/modules/system/controller/SysFactoryUserInfoController.java
......@@ -85,7 +85,7 @@ public class SysFactoryUserInfoController {
if(StringUtils.isEmpty(sysFactoryUserInfo.getDepartId())&&StringUtils.isNotBlank(departIds)) {
queryWrapper.in("depart_id", departIdArray);
}
queryWrapper.eq(StringUtils.isNotEmpty(sysFactoryUserInfo.getDepartId()),"depart_id",sysFactoryUserInfo.getDepartId());
Page<SysFactoryUserInfo> page = new Page<SysFactoryUserInfo>(pageNo, pageSize);
IPage<SysFactoryUserInfo> pageList = sysFactoryUserInfoService.page(page, queryWrapper);
result.setSuccess(true);
......
sk-module-system/src/main/java/com/skua/modules/system/controller/SysUserController.java
......@@ -121,20 +121,16 @@ public class SysUserController {
* @param user
* @param pageNo
* @param pageSize
* @param req
* @return
*/
@RequestMapping(value = "/list", method = RequestMethod.GET)
public Result<IPage<SysUser>> queryPageList(SysUser user, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
Result<IPage<SysUser>> result = new Result<IPage<SysUser>>();
//QueryWrapper<SysUser> queryWrapper = QueryGenerator.initQueryWrapper(user, req.getParameterMap());
List<String> factorys = new ArrayList<>();
if (!BaseContextHandler.getUserLoginName().equals("superadmin")) {
user.setIsSystemUser("0");
List<String> departIds = sysUserDepartService.queryDepartIdsOfUserId(BaseContextHandler.getUserId());
//List<String> userIds= sysUserDepartService.queryUserIdBydepartIds(departIds.toArray(new String[departIds.size()]));
//queryWrapper.in("id",userIds);
factorys.addAll(departIds);
if (!StringUtils.isBlank(user.getAreaId())) {
List<String> list = new ArrayList<>();
......@@ -142,7 +138,6 @@ public class SysUserController {
List<String> list1 = sysUserDepartService.loopDepart(list);
factorys.addAll(list1);
}
if (!CollectionUtils.isEmpty(factorys)) {
user.setDepartIds(factorys.toArray(new String[factorys.size()]));
}
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!