Skip to content

张雷 / skboot-zhongye

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

项目功能添加departId

1 个父辈 9aed77db
内嵌 并排
正在显示 36 个修改的文件 包含 177 行增加 和 77 行删除
sk-base-common/src/main/java/com/skua/modules/alarmtmp/mapper/xml/AlarmCustomRecordHistoryMapper.xml
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.skua.modules.alarmtmp.mapper.AlarmCustomRecordHistoryMapper">
<select id="queryCustomPageList" parameterType="com.skua.modules.alarmtmp.vo.AlarmRecordHistoryVO" resultType="com.skua.modules.alarmtmp.vo.AlarmRecordHistoryVO">
SELECT
c.alarm_rule_handle_type as alarm_custom_handle_type,
a.*,
d.depart_name,
case when a.handle_desc is null || a.handle_desc='' then 0 else 1 end as response_state,
case when a.handle_time is null then '' else HOUR(TIMEDIFF(a.handle_time, a.record_time)) end as diff_hour
FROM
alarm_record_history a
LEFT JOIN sys_depart d ON d.id = a.depart_id
LEFT JOIN alarm_custom_rule_repository c ON a.alarm_custom_rule_type = c.id
where 1=1
where 1=1
<if test="alarmRecordHistoryVO.departId!=null and alarmRecordHistoryVO.departId!=''">
and a.depart_id in
and a.depart_id in
<foreach item="item" index="index" collection="alarmRecordHistoryVO.departId.split(',')" open="("
separator="," close=")">
'${item}'
......@@ -28,12 +30,12 @@
and a.alarm_rule_level_name=#{alarmRecordHistoryVO.alarmRuleLevelName}
</if>
<!-- 报警开始时间 -->
<if test="alarmRecordHistoryVO.recordStratTime!=null and alarmRecordHistoryVO.recordStratTime!=''">
and a.record_time &gt;= #{alarmRecordHistoryVO.recordStratTime}
<if test="alarmRecordHistoryVO.startTime!=null and alarmRecordHistoryVO.startTime!=''">
and a.record_time &gt;= #{alarmRecordHistoryVO.startTime}
</if>
<!-- 报警结束时间 -->
<if test="alarmRecordHistoryVO.recordEndTime!=null and alarmRecordHistoryVO.recordEndTime!=''">
and a.record_time &lt;= #{alarmRecordHistoryVO.recordEndTime}
<if test="alarmRecordHistoryVO.endTime!=null and alarmRecordHistoryVO.endTime!=''">
and a.record_time &lt;= #{alarmRecordHistoryVO.endTime}
</if>
<!-- 报警类别 -->
<if test="alarmRecordHistoryVO.alarmRuleType!=null and alarmRecordHistoryVO.alarmRuleType!=''">
......@@ -48,16 +50,16 @@
</if>
order by a.record_time desc
</select>
<select id="statisticsCount" parameterType="com.skua.modules.alarmtmp.vo.AlarmRecordHistoryVO" resultType="java.util.HashMap">
SELECT
sum(case when handle_desc !='' and handle_desc is not null then 1 else 0 end) as response_count,
count(*) AS total_count
FROM
alarm_record_history a
where 1=1
where 1=1
<if test="alarmRecordHistoryVO.departId!=null and alarmRecordHistoryVO.departId!=''">
and a.depart_id in
and a.depart_id in
<foreach item="item" index="index" collection="alarmRecordHistoryVO.departId.split(',')" open="("
separator="," close=")">
'${item}'
......@@ -72,12 +74,12 @@
and a.alarm_rule_level_name=#{alarmRecordHistoryVO.alarmRuleLevelName}
</if>
<!-- 报警开始时间 -->
<if test="alarmRecordHistoryVO.recordStratTime!=null and alarmRecordHistoryVO.recordStratTime!=''">
and a.record_time &gt;= #{alarmRecordHistoryVO.recordStratTime}
<if test="alarmRecordHistoryVO.startTime!=null and alarmRecordHistoryVO.startTime!=''">
and a.record_time &gt;= #{alarmRecordHistoryVO.startTime}
</if>
<!-- 报警结束时间 -->
<if test="alarmRecordHistoryVO.recordEndTime!=null and alarmRecordHistoryVO.recordEndTime!=''">
and a.record_time &lt;= #{alarmRecordHistoryVO.recordEndTime}
<if test="alarmRecordHistoryVO.endTime!=null and alarmRecordHistoryVO.endTime!=''">
and a.record_time &lt;= #{alarmRecordHistoryVO.endTime}
</if>
<!-- 报警类别 -->
<if test="alarmRecordHistoryVO.alarmRuleType!=null and alarmRecordHistoryVO.alarmRuleType!=''">
......@@ -90,15 +92,15 @@
<if test="alarmRecordHistoryVO.responseState=='0'">
and a.handle_desc is null
</if>
</select>
<update id="readAlarmBatch" parameterType="com.skua.modules.alarmtmp.vo.AlarmRecordHistoryVO">
UPDATE alarm_record_history SET handle_status ='1', handle_time=now(),handle_user=#{alarmRecordHistoryVO.handleUser}
where 1=1
UPDATE alarm_record_history SET handle_status ='1', handle_time=now(),handle_user=#{alarmRecordHistoryVO.handleUser}
where 1=1
<!-- 机构条件批量已读 -->
<if test="alarmRecordHistoryVO.departId!=null and alarmRecordHistoryVO.departId!=''">
and depart_id in
and depart_id in
<foreach item="item" index="index" collection="alarmRecordHistoryVO.departId.split(',')" open="("
separator="," close=")">
'${item}'
......@@ -106,7 +108,7 @@
</if>
<!-- 按勾选id批量已读 -->
<if test="alarmRecordHistoryVO.id!=null and alarmRecordHistoryVO.id!=''">
and id in
and id in
<foreach item="item" index="index" collection="alarmRecordHistoryVO.id.split(',')" open="("
separator="," close=")">
'${item}'
......@@ -140,5 +142,5 @@
and handle_desc is null
</if>
</update>
</mapper>
\ No newline at end of file
</mapper>
......
sk-module-alarm/sk-module-alarm.iml
......@@ -4,7 +4,9 @@
<facet type="jpa" name="JPA">
<configuration>
<setting name="validation-enabled" value="true" />
<datasource-mapping />
<datasource-mapping>
<factory-entry name="entityManagerFactory" />
</datasource-mapping>
<naming-strategy-map />
</configuration>
</facet>
......
sk-module-alarm/src/main/java/com/skua/modules/controller/web/AlarmCustomRecordHistoryController.java
......@@ -87,8 +87,7 @@ public class AlarmCustomRecordHistoryController {
try {
Page<AlarmRecordHistoryVO> pageList = new Page<>(pageNo, pageSize);
if (alarmRecordHistoryVO.getDepartId() == null) {
String departIds = BaseContextHandler.getDeparts();
alarmRecordHistoryVO.setDepartId(departIds);
alarmRecordHistoryVO.setDepartId(BaseContextHandler.getDeparts());
}
pageList = alarmCustomRecordHistoryService.queryCustomPageList(pageList, alarmRecordHistoryVO);// 自定义查询
result.setSuccess(true);
......@@ -100,7 +99,7 @@ public class AlarmCustomRecordHistoryController {
}
return result;
}
@ApiOperation(value = "报警历史记录-报警统计", notes = "报警历史记录-报警统计，{totalMap:{count:xx,responseState:''},responseMap:{count:xx,responseState:'1'},noResponseMap:{count:xx,responseState:'0'}}")
@GetMapping(value = "/statistics")
public Result<Map<String,Map<String,Object>>> statistics(AlarmRecordHistoryVO alarmRecordHistoryVO) {
......@@ -156,7 +155,7 @@ public class AlarmCustomRecordHistoryController {
}
return result;
}
/**
* <pre>
* 手动发起工作流
......@@ -181,7 +180,7 @@ public class AlarmCustomRecordHistoryController {
}
return result;
}
@ApiOperation(value = "报警-批量已读", notes = "报警-批量已读")
@GetMapping(value = "/readAlarmBatch")
public Result<String> readAlarmBatch(AlarmRecordHistoryVO alarmRecordHistoryVO) {
......
sk-module-analysis/sk-module-analysis.iml
......@@ -4,7 +4,9 @@
<facet type="jpa" name="JPA">
<configuration>
<setting name="validation-enabled" value="true" />
<datasource-mapping />
<datasource-mapping>
<factory-entry name="sk-module-analysis" />
</datasource-mapping>
<naming-strategy-map />
</configuration>
</facet>
......
sk-module-biz/sk-module-biz.iml
......@@ -5,7 +5,9 @@
<configuration>
<setting name="validation-enabled" value="true" />
<setting name="provider-name" value="Hibernate" />
<datasource-mapping />
<datasource-mapping>
<factory-entry name="entityManagerFactory" />
</datasource-mapping>
<naming-strategy-map />
</configuration>
</facet>
......
sk-module-biz/src/main/java/com/skua/modules/assessment/controller/DataAssessmentSocreMasterController.java
......@@ -35,7 +35,7 @@ public class DataAssessmentSocreMasterController {
private ISequenceService sequenceService;
/**
* 分页列表查询
* @param dataAssessmentSocreMaster
* @param dataAssessmentSocreMasterVO
* @param pageNo
* @param pageSize
* @param req
......@@ -222,7 +222,7 @@ public class DataAssessmentSocreMasterController {
/**
* 通过id查询
* @param id
* @param dataAssessmentSocreMasterVO
* @return
*/
@AutoLog(value = "绩效考核基础信息-通过id查询")
......@@ -249,10 +249,6 @@ public class DataAssessmentSocreMasterController {
}
}
}
// double excellentPercentage = totalScores > 0 ? (double) excellent / totalScores * 100 : 0;
// double passPercentage = totalScores > 0 ? (double) pass / totalScores * 100 : 0;
// double failPercentage = totalScores > 0 ? (double) fail / totalScores * 100 : 0;
resMap.put("excellent",excellent);
resMap.put("pass",pass);
resMap.put("fail",fail);
......@@ -263,7 +259,7 @@ public class DataAssessmentSocreMasterController {
/**
* 通过id查询
* @param id
* @param dataAssessmentSocreMasterVO
* @return
*/
@AutoLog(value = "绩效考核基础信息-通过id查询")
......
sk-module-biz/src/main/java/com/skua/modules/assessment/entity/DataAssessmentSocre.java
......@@ -4,6 +4,7 @@ import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.skua.core.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -64,7 +65,10 @@ public class DataAssessmentSocre {
@Excel(name = "创建人", width = 15)
@ApiModelProperty(value = "创建人")
private String createBy;
/**所属厂区*/
@Excel(name = "所属厂区", width = 15)
@ApiModelProperty(value = "所属厂区")
@Dict(dictTable = "sys_depart", dicCode="id", dicText = "depart_name")
private String departId;
/**创建时间*/
@Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
......
sk-module-biz/src/main/java/com/skua/modules/assessment/entity/DataAssessmentSocreMaster.java
......@@ -4,6 +4,7 @@ import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.skua.core.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -29,6 +30,11 @@ public class DataAssessmentSocreMaster extends FlowEntity{
@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;
/**考核配置表id*/
@Excel(name = "考核配置表id", width = 15)
@ApiModelProperty(value = "考核配置表id")
......
sk-module-biz/src/main/java/com/skua/modules/assessment/mapper/xml/DataAssessmentSocreMasterMapper.xml
......@@ -4,7 +4,7 @@
<select id="queryCustomPageList" parameterType="com.skua.modules.assessment.vo.DataAssessmentSocreMasterVO" resultType="com.skua.modules.assessment.vo.DataAssessmentSocreMasterVO">
SELECT
(select realname from sys_user where id=a.assessment_user) as assessment_user_realname,
(select depart_name from sys_depart where id=a.assessment_depart) as assessment_depart_realname,
(select depart_name from sys_depart where id=a.depart_id) as assessment_depart_realname,
(select realname from sys_user where username=a.create_by) as assessor_user_realname,
(select depart_name from sys_depart where org_code=a.create_dept) as assessor_depart_realname,
a.*
......@@ -22,6 +22,9 @@
<if test="dataAssessmentSocreMasterVO.assessmentDepart!=null and dataAssessmentSocreMasterVO.assessmentDepart!=''">
and a.assessment_depart = #{dataAssessmentSocreMasterVO.assessmentDepart}
</if>
<if test="dataAssessmentSocreMasterVO.departId!=null and dataAssessmentSocreMasterVO.departId!=''">
and a.depart_id = #{dataAssessmentSocreMasterVO.departId}
</if>
<if test="dataAssessmentSocreMasterVO.assessmentPositions!=null and dataAssessmentSocreMasterVO.assessmentPositions!=''">
and a.assessment_positions = #{dataAssessmentSocreMasterVO.assessmentPositions}
</if>
......@@ -75,7 +78,7 @@
<select id="getAllData" parameterType="com.skua.modules.assessment.vo.DataAssessmentSocreMasterVO" resultType="com.skua.modules.assessment.vo.DataAssessmentSocreMasterVO">
SELECT
(select realname from sys_user where id=a.assessment_user) as assessment_user_realname,
(select depart_name from sys_depart where id=a.assessment_depart) as assessment_depart_realname,
(select depart_name from sys_depart where id=a.depart_id) as assessment_depart_realname,
(select realname from sys_user where username=a.create_by) as assessor_user_realname,
(select depart_name from sys_depart where org_code=a.create_dept) as assessor_depart_realname,
a.*
......@@ -93,6 +96,9 @@
<if test="dataAssessmentSocreMasterVO.assessmentDepart!=null and dataAssessmentSocreMasterVO.assessmentDepart!=''">
and a.assessment_depart = #{dataAssessmentSocreMasterVO.assessmentDepart}
</if>
<if test="dataAssessmentSocreMasterVO.departId!=null and dataAssessmentSocreMasterVO.departId!=''">
and a.depart_id = #{dataAssessmentSocreMasterVO.departId}
</if>
<if test="dataAssessmentSocreMasterVO.assessmentPositions!=null and dataAssessmentSocreMasterVO.assessmentPositions!=''">
and a.assessment_positions = #{dataAssessmentSocreMasterVO.assessmentPositions}
</if>
......@@ -102,7 +108,6 @@
<if test="dataAssessmentSocreMasterVO.assessmentDate!=null and dataAssessmentSocreMasterVO.assessmentDate!=''">
and a.assessment_date = #{dataAssessmentSocreMasterVO.assessmentDate}
</if>
order by a.create_time desc
</select>
</mapper>
......
sk-module-biz/src/main/java/com/skua/modules/assessment/service/impl/DataAssessmentSocreMasterServiceImpl.java
......@@ -33,7 +33,6 @@ public class DataAssessmentSocreMasterServiceImpl extends ServiceImpl<DataAssess
@Override
public Page<DataAssessmentSocreMasterVO> queryCustomPageList(Page<DataAssessmentSocreMasterVO> pageList,
DataAssessmentSocreMasterVO DataAssessmentSocreMasterVO) {
// TODO Auto-generated method stub
return pageList.setRecords(baseMapper.queryCustomPageList(pageList, DataAssessmentSocreMasterVO));
}
......
sk-module-biz/src/main/java/com/skua/modules/assessment/vo/DataAssessmentSocreMasterVO.java
......@@ -33,6 +33,12 @@ public class DataAssessmentSocreMasterVO extends FlowEntity {
@ApiModelProperty(value = "考核配置表id")
@Dict(dictTable = "data_assessment_info", dicCode="id", dicText = "asse_report_name")
private String reportId;
/**所属厂区*/
@Excel(name = "所属厂区", width = 15)
@ApiModelProperty(value = "所属厂区")
@Dict(dictTable = "sys_depart", dicCode="id", dicText = "depart_name")
private String departId;
/**
* 考核时间
*/
......
sk-module-datafill/sk-module-datafill.iml
......@@ -4,7 +4,9 @@
<facet type="jpa" name="JPA">
<configuration>
<setting name="validation-enabled" value="true" />
<datasource-mapping />
<datasource-mapping>
<factory-entry name="entityManagerFactory" />
</datasource-mapping>
<naming-strategy-map />
</configuration>
</facet>
......
sk-module-equipment/sk-module-equipment.iml
......@@ -4,7 +4,9 @@
<facet type="jpa" name="JPA">
<configuration>
<setting name="validation-enabled" value="true" />
<datasource-mapping />
<datasource-mapping>
<factory-entry name="entityManagerFactory" />
</datasource-mapping>
<naming-strategy-map />
</configuration>
</facet>
......
sk-module-expert/sk-module-expert.iml
......@@ -4,7 +4,9 @@
<facet type="jpa" name="JPA">
<configuration>
<setting name="validation-enabled" value="true" />
<datasource-mapping />
<datasource-mapping>
<factory-entry name="entityManagerFactory" />
</datasource-mapping>
<naming-strategy-map />
</configuration>
</facet>
......
sk-module-flow/sk-module-flow.iml
......@@ -4,7 +4,9 @@
<facet type="jpa" name="JPA">
<configuration>
<setting name="validation-enabled" value="true" />
<datasource-mapping />
<datasource-mapping>
<factory-entry name="sk-module-flow" />
</datasource-mapping>
<naming-strategy-map />
</configuration>
</facet>
......
sk-module-inspection/sk-module-inspection.iml
......@@ -4,7 +4,9 @@
<facet type="jpa" name="JPA">
<configuration>
<setting name="validation-enabled" value="true" />
<datasource-mapping />
<datasource-mapping>
<factory-entry name="entityManagerFactory" />
</datasource-mapping>
<naming-strategy-map />
</configuration>
</facet>
......
sk-module-inspection/src/main/java/com/skua/modules/inspection/controller/web/InspectionFillController.java
......@@ -18,6 +18,7 @@ import com.skua.modules.system.service.ISysDictService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
......@@ -66,8 +67,10 @@ public class InspectionFillController {
HttpServletRequest req) {
Result<IPage<InspectionFillVO>> result = new Result<>();
try {
inspectionFillVO.setDelFlag(0);
QueryWrapper<InspectionFillVO> queryWrapper = QueryGenerator.initQueryWrapper(inspectionFillVO, req.getParameterMap());
QueryWrapper<InspectionFillVO> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("ifi.del_flag",0);
queryWrapper.eq("ifi.module_type","1");
queryWrapper.eq(StringUtils.isNotBlank(inspectionFillVO.getDepartId()),"ifi.depart_id",inspectionFillVO.getDepartId());
Page<InspectionFillVO> page = new Page<>(pageNo, pageSize);
queryWrapper.groupBy("ifi.id");
IPage<InspectionFillVO> pageList = inspectionFillService.getPage(page, queryWrapper);
......
sk-module-inspection/src/main/java/com/skua/modules/inspection/controller/web/InspectionFillGroupFillController.java
......@@ -35,10 +35,10 @@ public class InspectionFillGroupFillController {
* @author Xie Chao，2021-08-14 10:26
*/
@GetMapping("/getInspectionFillGroupFill")
public Result<List<Map<String, Object>>> getInspectionFillGroupFill(String groupName) {
public Result<List<Map<String, Object>>> getInspectionFillGroupFill(String groupName,String departId) {
Result<List<Map<String, Object>>> result = new Result<>();
try {
List<Map<String, Object>> list = inspectionFillGroupFillService.getInspectionFillGroupFill(groupName);
List<Map<String, Object>> list = inspectionFillGroupFillService.getInspectionFillGroupFill(groupName,departId);
result.setSuccess(true);
result.setResult(list);
} catch (Exception e) {
......
sk-module-inspection/src/main/java/com/skua/modules/inspection/entity/InspectionFill.java
......@@ -22,7 +22,7 @@ import org.jeecgframework.poi.excel.annotation.Excel;
@Accessors(chain = true)
@ApiModel(value="inspection_fill对象", description="巡检填报项")
public class InspectionFill {
/**主键*/
@TableId(type = IdType.ID_WORKER_STR)
@ApiModelProperty(value = "主键")
......@@ -53,6 +53,11 @@ public class InspectionFill {
@Excel(name = "版块类型", width = 15)
@ApiModelProperty(value = "版块类型")
private String moduleType;
/**所属厂区*/
@Excel(name = "所属厂区", width = 15)
@ApiModelProperty(value = "所属厂区")
@Dict(dictTable = "sys_depart", dicCode="id", dicText = "depart_name")
private String departId;
/**创建时间*/
@Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
......
sk-module-inspection/src/main/java/com/skua/modules/inspection/entity/InspectionFillChoice.java
......@@ -3,6 +3,7 @@ package com.skua.modules.inspection.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.skua.core.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -23,7 +24,7 @@ import java.io.Serializable;
@Accessors(chain = true)
@ApiModel(value="inspection_fill_choice对象", description="巡检填报项-选项")
public class InspectionFillChoice implements Serializable{
/**主键 */
@TableId(type = IdType.ID_WORKER_STR)
@ApiModelProperty(value = "主键 ")
......@@ -40,6 +41,11 @@ public class InspectionFillChoice implements Serializable{
@Excel(name = "选项状态（0:异常，1正常）", width = 15)
@ApiModelProperty(value = "选项状态（0:异常，1正常）")
private String choiceState;
/**所属厂区*/
@Excel(name = "所属厂区", width = 15)
@ApiModelProperty(value = "所属厂区")
@Dict(dictTable = "sys_depart", dicCode="id", dicText = "depart_name")
private String departId;
/**排序*/
@Excel(name = "排序", width = 15)
@ApiModelProperty(value = "排序")
......
sk-module-inspection/src/main/java/com/skua/modules/inspection/entity/InspectionFillGroup.java
......@@ -3,6 +3,7 @@ package com.skua.modules.inspection.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.skua.core.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -21,7 +22,7 @@ import org.jeecgframework.poi.excel.annotation.Excel;
@Accessors(chain = true)
@ApiModel(value="inspection_fill_group对象", description="巡检填报组")
public class InspectionFillGroup {
/**主键*/
@TableId(type = IdType.ID_WORKER_STR)
@ApiModelProperty(value = "主键")
......@@ -38,6 +39,11 @@ public class InspectionFillGroup {
@Excel(name = "版块类型", width = 15)
@ApiModelProperty(value = "版块类型")
private String moduleType;
/**所属厂区*/
@Excel(name = "所属厂区", width = 15)
@ApiModelProperty(value = "所属厂区")
@Dict(dictTable = "sys_depart", dicCode="id", dicText = "depart_name")
private String departId;
/**创建人id*/
@Excel(name = "创建人id", width = 15)
@ApiModelProperty(value = "创建人id")
......
sk-module-inspection/src/main/java/com/skua/modules/inspection/entity/InspectionFillGroupFill.java
......@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableField;
import com.skua.core.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -24,7 +25,7 @@ import org.jeecgframework.poi.excel.annotation.Excel;
@Accessors(chain = true)
@ApiModel(value="inspection_fill_group_fill对象", description="巡检填报组-填报项")
public class InspectionFillGroupFill {
/**主键*/
@TableId(type = IdType.ID_WORKER_STR)
@ApiModelProperty(value = "主键")
......@@ -37,6 +38,11 @@ public class InspectionFillGroupFill {
@Excel(name = "巡检填报项ID", width = 15)
@ApiModelProperty(value = "巡检填报项ID")
private String inspectionFillId;
/**所属厂区*/
@Excel(name = "所属厂区", width = 15)
@ApiModelProperty(value = "所属厂区")
@Dict(dictTable = "sys_depart", dicCode="id", dicText = "depart_name")
private String departId;
/**排序*/
@Excel(name = "排序", width = 15)
@ApiModelProperty(value = "排序")
......
sk-module-inspection/src/main/java/com/skua/modules/inspection/entity/InspectionTaskFillGroupFill.java
......@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableField;
import com.skua.core.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -24,7 +25,7 @@ import org.jeecgframework.poi.excel.annotation.Excel;
//@Accessors(chain = true)
@ApiModel(value="inspection_task_fill_group_fill对象", description="巡检任务-填报组-填报项")
public class InspectionTaskFillGroupFill {
/**主键*/
@TableId(type = IdType.ID_WORKER_STR)
@ApiModelProperty(value = "主键")
......@@ -42,6 +43,11 @@ public class InspectionTaskFillGroupFill {
@Excel(name = "巡检填报项ID", width = 15)
@ApiModelProperty(value = "巡检填报项ID")
private String inspectionFillId;
/**所属厂区*/
@Excel(name = "所属厂区", width = 15)
@ApiModelProperty(value = "所属厂区")
@Dict(dictTable = "sys_depart", dicCode="id", dicText = "depart_name")
private String departId;
/**排序*/
@Excel(name = "排序", width = 15)
@ApiModelProperty(value = "排序")
......
sk-module-inspection/src/main/java/com/skua/modules/inspection/mapper/InspectionFillGroupFillMapper.java
......@@ -21,12 +21,14 @@ public interface InspectionFillGroupFillMapper extends BaseMapper<InspectionFill
List<InspectionFillGroupFillVO> getPage(Page<InspectionFillGroupFillVO> page, @Param(Constants.WRAPPER) QueryWrapper<InspectionFillGroupFillVO> inspectionFillGroupFillVOQueryWrapper);
@Select("SELECT\n" +
"\tifg.id,group_name,fill_name,fill_type,fill_unit,group_concat(choice_name order by ifc.sort SEPARATOR \"|\") choice_name\n" +
"FROM\n" +
"\tinspection_fill_group ifg \n" +
"\tleft join inspection_fill_group_fill ifgf on ifg.id = ifgf.inspection_fill_group_id\n" +
"\tleft join inspection_fill ifi on ifgf.inspection_fill_id = ifi.id and ifi.del_flag = '0' " +
"\tleft join inspection_fill_choice ifc on ifi.id = ifc.inspection_fill_id ${ew.customSqlSegment}")
@Select("SELECT " +
" ifg.id,group_name,fill_name,fill_type,fill_unit," +
" group_concat(choice_name order by ifc.sort SEPARATOR \"|\") choice_name,d.id as depart_id " +
" FROM " +
" inspection_fill_group ifg " +
" left join inspection_fill_group_fill ifgf on ifg.id = ifgf.inspection_fill_group_id " +
" left join sys_depart d on d.id = ifg.depart_id " +
" left join inspection_fill ifi on ifgf.inspection_fill_id = ifi.id and ifi.del_flag = '0' " +
" left join inspection_fill_choice ifc on ifi.id = ifc.inspection_fill_id ${ew.customSqlSegment}")
List<InspectionPointFillGroupAndFillVO> getList(@Param(Constants.WRAPPER) QueryWrapper<InspectionPointFillGroupAndFillVO> inspectionPointFillGroupAndFillVOQueryWrapper);
}
......
sk-module-inspection/src/main/java/com/skua/modules/inspection/service/IInspectionFillGroupFillService.java
......@@ -18,7 +18,7 @@ import java.util.Map;
public interface IInspectionFillGroupFillService extends IService<InspectionFillGroupFill> {
IPage<InspectionFillGroupFillVO> getPage(Page<InspectionFillGroupFillVO> page, QueryWrapper<InspectionFillGroupFillVO> inspectionFillGroupFillVOQueryWrapper);
List<Map<String, Object>> getInspectionFillGroupFill(String groupName);
List<Map<String, Object>> getInspectionFillGroupFill(String groupName,String departId);
void updateInspectionFillGroupFill(InspectionGroupFillUpdateListVO inspectionGroupFillUpdateListVO);
......
sk-module-inspection/src/main/java/com/skua/modules/inspection/service/impl/InspectionFillGroupFillServiceImpl.java
......@@ -53,7 +53,7 @@ public class InspectionFillGroupFillServiceImpl extends ServiceImpl<InspectionFi
}
@Override
public List<Map<String, Object>> getInspectionFillGroupFill(String groupName) {
public List<Map<String, Object>> getInspectionFillGroupFill(String groupName,String departId) {
List<Map<String,Object>> resultList = new ArrayList<>();
Map<String,Object> resultMap;
QueryWrapper<InspectionPointFillGroupAndFillVO> inspectionPointFillGroupAndFillVOQueryWrapper = new QueryWrapper<>();
......@@ -61,6 +61,7 @@ public class InspectionFillGroupFillServiceImpl extends ServiceImpl<InspectionFi
inspectionPointFillGroupAndFillVOQueryWrapper.like("group_name",groupName);
}
inspectionPointFillGroupAndFillVOQueryWrapper.eq("ifg.del_flag","0");
inspectionPointFillGroupAndFillVOQueryWrapper.eq(StringUtils.isNotEmpty(departId),"ifg.depart_id",departId);
inspectionPointFillGroupAndFillVOQueryWrapper.groupBy("ifg.id","ifi.id","group_name","fill_name","fill_unit");
inspectionPointFillGroupAndFillVOQueryWrapper.orderByDesc("ifg.create_time");
inspectionPointFillGroupAndFillVOQueryWrapper.orderByAsc("ifgf.inspection_fill_group_id","ifgf.sort");
......@@ -71,11 +72,15 @@ public class InspectionFillGroupFillServiceImpl extends ServiceImpl<InspectionFi
resultMap = new HashMap<>();
resultMap.put("id",inspectionPointFillGroupAndFillJsonObject.get("id"));
resultMap.put("groupName",inspectionPointFillGroupAndFillJsonObject.get("groupName"));
resultMap.put("departId",inspectionPointFillGroupAndFillJsonObject.get("departId"));
resultMap.put("departId_dictText",inspectionPointFillGroupAndFillJsonObject.get("departId_dictText"));
List<Map<String,Object>> fillList = new ArrayList<>();
Map<String,Object> fillMap = new HashMap<>();
fillMap.put("fillName",inspectionPointFillGroupAndFillJsonObject.get("fillName"));
fillMap.put("fillType",inspectionPointFillGroupAndFillJsonObject.get("fillType"));
fillMap.put("departId",inspectionPointFillGroupAndFillJsonObject.get("departId"));
fillMap.put("fillType_dictText",inspectionPointFillGroupAndFillJsonObject.get("fillType_dictText"));
fillMap.put("departId_dictText",inspectionPointFillGroupAndFillJsonObject.get("departId_dictText"));
fillMap.put("fillUnit",inspectionPointFillGroupAndFillJsonObject.get("fillUnit"));
fillMap.put("choiceName",inspectionPointFillGroupAndFillJsonObject.get("choiceName"));
if (fillGroupFillMap.containsKey(inspectionPointFillGroupAndFillJsonObject.get("id"))){
......@@ -109,15 +114,18 @@ public class InspectionFillGroupFillServiceImpl extends ServiceImpl<InspectionFi
@Transactional(rollbackFor = Exception.class)
public void updateInspectionFillGroupFill(InspectionGroupFillUpdateListVO inspectionGroupFillUpdateListVO) {
String groupId = inspectionGroupFillUpdateListVO.getGroupId();
String departId = inspectionGroupFillUpdateListVO.getDepartId();
if (StringUtils.isBlank(groupId)){
InspectionFillGroup inspectionFillGroup = new InspectionFillGroup();
inspectionFillGroup.setGroupName(inspectionGroupFillUpdateListVO.getGroupName());
inspectionFillGroup.setDepartId(departId);
inspectionFillGroup.setModuleType("2");
inspectionFillGroupService.save(inspectionFillGroup);
groupId = inspectionFillGroup.getId();
}else{
InspectionFillGroup inspectionFillGroup = new InspectionFillGroup();
inspectionFillGroup.setId(groupId);
inspectionFillGroup.setDepartId(departId);
inspectionFillGroup.setGroupName(inspectionGroupFillUpdateListVO.getGroupName());
inspectionFillGroupService.updateById(inspectionFillGroup);
}
......@@ -163,6 +171,7 @@ public class InspectionFillGroupFillServiceImpl extends ServiceImpl<InspectionFi
inspectionFillGroupFill = new InspectionFillGroupFill();
inspectionFillGroupFill.setInspectionFillGroupId(groupId);
inspectionFillGroupFill.setInspectionFillId(inspectionFillId);
inspectionFillGroupFill.setDepartId(departId);
inspectionFillGroupFill.setSort(inspectionFillAndChoiceVO.getSort()+"");
save(inspectionFillGroupFill);
}
......@@ -186,6 +195,7 @@ public class InspectionFillGroupFillServiceImpl extends ServiceImpl<InspectionFi
if (inspectionFillGroupFill == null){
inspectionFillGroupFill = new InspectionFillGroupFill();
inspectionFillGroupFill.setInspectionFillGroupId(groupId);
inspectionFillGroupFill.setDepartId(departId);
inspectionFillGroupFill.setInspectionFillId(inspectionFillId);
inspectionFillGroupFill.setSort(inspectionFillAndChoiceVO.getSort()+"");
save(inspectionFillGroupFill);
......@@ -222,7 +232,6 @@ public class InspectionFillGroupFillServiceImpl extends ServiceImpl<InspectionFi
List<InspectionFill> inspectionFillList = inspectionFillService.list(inspectionFillQueryWrapper);
boolean flag = false;
// if ("3".equals(fill.getFillType()) || "4".equals(fill.getFillType())){
for (InspectionFill inspectionFill : inspectionFillList) {
//通过填报项Id查询填报项选项数据
QueryWrapper<InspectionFillChoice> fillChoiceQueryWrapper = new QueryWrapper<>();
......@@ -236,6 +245,7 @@ public class InspectionFillGroupFillServiceImpl extends ServiceImpl<InspectionFi
removeByMap(removeMap);
InspectionFillGroupFill inspectionFillGroupFill = new InspectionFillGroupFill();
inspectionFillGroupFill.setInspectionFillGroupId(groupId);
inspectionFillGroupFill.setDepartId(departId);
inspectionFillGroupFill.setInspectionFillId(inspectionFill.getId());
inspectionFillGroupFill.setSort(inspectionFillAndChoiceVO.getSort()+"");
save(inspectionFillGroupFill);
......@@ -261,6 +271,7 @@ public class InspectionFillGroupFillServiceImpl extends ServiceImpl<InspectionFi
if (inspectionFillGroupFill == null){
inspectionFillGroupFill = new InspectionFillGroupFill();
inspectionFillGroupFill.setInspectionFillGroupId(groupId);
inspectionFillGroupFill.setDepartId(departId);
inspectionFillGroupFill.setInspectionFillId(inspectionFillId);
inspectionFillGroupFill.setSort(inspectionFillAndChoiceVO.getSort()+"");
save(inspectionFillGroupFill);
......@@ -286,8 +297,8 @@ public class InspectionFillGroupFillServiceImpl extends ServiceImpl<InspectionFi
QueryWrapper<InspectionFillGroup> inspectionFillGroupQueryWrapper = new QueryWrapper<>();
inspectionFillGroupQueryWrapper.eq("id", inspectionFillGroupId);
InspectionFillGroup inspectionFillGroup = inspectionFillGroupService.getOne(inspectionFillGroupQueryWrapper);
resultMap.put("departId",inspectionFillGroup.getDepartId());
resultMap.put("inspectionFillGroup",inspectionFillGroup);
List<Map<String,Object>> inspectionFillMapList = new ArrayList<>();
Map<String,Object> inspectionFillMap;
//查询填报组的数据
......
sk-module-inspection/src/main/java/com/skua/modules/inspection/vo/InspectionFillGroupFillVO.java
......@@ -45,6 +45,11 @@ public class InspectionFillGroupFillVO {
@Excel(name = "版块类型", width = 15)
@ApiModelProperty(value = "版块类型")
private String moduleType;
/**所属厂区*/
@Excel(name = "所属厂区", width = 15)
@ApiModelProperty(value = "所属厂区")
@Dict(dictTable = "sys_depart", dicCode="id", dicText = "depart_name")
private String departId;
/**创建时间*/
@Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
......@@ -96,4 +101,4 @@ public class InspectionFillGroupFillVO {
@Excel(name = "排序", width = 15)
@ApiModelProperty(value = "排序")
private String sort;
}
\ No newline at end of file
}
......
sk-module-inspection/src/main/java/com/skua/modules/inspection/vo/InspectionFillVO.java
......@@ -49,6 +49,11 @@ public class InspectionFillVO {
@Excel(name = "版块类型", width = 15)
@ApiModelProperty(value = "版块类型")
private String moduleType;
/**所属厂区*/
@Excel(name = "所属厂区", width = 15)
@ApiModelProperty(value = "所属厂区")
@Dict(dictTable = "sys_depart", dicCode="id", dicText = "depart_name")
private String departId;
/**创建时间*/
@Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
......@@ -84,4 +89,4 @@ public class InspectionFillVO {
private String choiceName;
}
\ No newline at end of file
}
......
sk-module-inspection/src/main/java/com/skua/modules/inspection/vo/InspectionGroupFillUpdateListVO.java
......@@ -17,8 +17,10 @@ public class InspectionGroupFillUpdateListVO {
private String groupId;
/**填报组名称*/
private String groupName;
/**所属厂区*/
private String departId;
/**对应的用户id集合*/
private List<InspectionFillAndChoiceVO> inspectionFillAndChoiceVOList;
/**单次：single，全局：global*/
private String applicationArea;
}
\ No newline at end of file
}
......
sk-module-inspection/src/main/java/com/skua/modules/inspection/vo/InspectionPointFillGroupAndFillVO.java
package com.skua.modules.inspection.vo;
import com.skua.core.aspect.annotation.Dict;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.jeecgframework.poi.excel.annotation.Excel;
/**
* @program: skboot
......@@ -31,5 +33,9 @@ public class InspectionPointFillGroupAndFillVO {
@Dict(dicCode = "id",dicText = "equipment_name",dictTable = "equipment_info")
private String equipInfoId;
/**所属厂区*/
@Dict(dictTable = "sys_depart", dicCode="id", dicText = "depart_name")
private String departId;
private String inspectionFillGroupId;
}
......
sk-module-system/sk-module-system.iml
......@@ -4,7 +4,9 @@
<facet type="jpa" name="JPA">
<configuration>
<setting name="validation-enabled" value="true" />
<datasource-mapping />
<datasource-mapping>
<factory-entry name="entityManagerFactory" />
</datasource-mapping>
<naming-strategy-map />
</configuration>
</facet>
......
sk-module-system/src/main/java/com/skua/modules/system/controller/SysUserController.java
......@@ -1201,10 +1201,9 @@ public class SysUserController {
* 运营部人员列表
*/
@RequestMapping(value = "/operationUserList", method = RequestMethod.GET)
public Result<List<SysUser>> operationUserList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) {
public Result<List<SysUser>> operationUserList(String departId) {
Result<List<SysUser>> result = new Result<>();
List<SysUser> pageList = sysUserService.operationUserList();
List<SysUser> pageList = sysUserService.operationUserList(departId);
result.setSuccess(true);
result.setResult(pageList);
return result;
......
sk-module-system/src/main/java/com/skua/modules/system/mapper/SysUserMapper.java
......@@ -73,5 +73,5 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
List<SysUser> getUserByUserIds(@Param("userIds") String userIds);
List<SysUser> operationUserList();
List<SysUser> operationUserList(@Param("departId") String departId);
}
......
sk-module-system/src/main/java/com/skua/modules/system/mapper/xml/SysUserMapper.xml
......@@ -121,5 +121,8 @@
SELECT * FROM sys_user b
LEFT JOIN sys_user_depart a ON b.id=a.user_id
LEFT JOIN sys_depart c ON c.id =a.dep_id
<if test="departId!=null and departId!=''">
WHERE a.dep_id = #{departId} OR a.dep_ids LIKE CONCAT('%',#{departId},'%')
</if>
</select>
</mapper>
......
sk-module-system/src/main/java/com/skua/modules/system/service/ISysUserService.java
......@@ -145,5 +145,5 @@ public interface ISysUserService extends IService<SysUser> {
**/
List<SysUser> getUserByUserIds(String userIds);
List<SysUser> operationUserList();
List<SysUser> operationUserList(String departId);
}
......
sk-module-system/src/main/java/com/skua/modules/system/service/impl/SysUserServiceImpl.java
......@@ -305,7 +305,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
}
@Override
public List<SysUser> operationUserList() {
return userMapper.operationUserList();
public List<SysUser> operationUserList(String departId) {
return userMapper.operationUserList(departId);
}
}
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!