Skip to content

Z
zlmy-cloud
Commit fb0bd97b authored by Rensq's avatar Rensq
Browse files
Options

Merge remote-tracking branch 'origin/dev_2.6.0' into dev_2.6.0

parents 6b102510 c95f6655
Hide whitespace changes
Inline Side-by-side
Showing with 162 additions and 15 deletions
zlmy-modules/zlmy-boot/doc/v2.6.0/修改记录.md
View file @ fb0bd97b
......@@ -160,7 +160,7 @@ ALTER TABLE t_train_project
ALTER COLUMN visit_type TYPE varchar(1000);
# 修改 act_id_group
# 修改 act_id_group(公司测试环境使用)
CREATE OR REPLACE VIEW ACT_ID_GROUP AS
SELECT NULL
:: text AS REV_,
......@@ -195,6 +195,25 @@ ORDER BY
r.tree_level NULLS FIRST;
# 修改 act_id_group(客户环境使用)
CREATE OR REPLACE VIEW ACT_ID_GROUP AS
SELECT
NULL::text AS REV_,
CONCAT(r.tree_level::text, '-', r.role_id::text) AS ID_,
CASE
WHEN r.tree_level = 1 THEN CONCAT('总公司-', r.role_name)
WHEN r.tree_level = 2 THEN CONCAT('大区/平台-', r.role_name)
WHEN r.tree_level = 3 THEN CONCAT('经营部-', r.role_name)
WHEN r.tree_level = 4 THEN CONCAT('基层企业-', r.role_name)
ELSE r.role_name::text
END AS NAME_,
r.tree_level AS TYPE_
FROM t_sys_role r
WHERE r.STATUS::integer = 0
AND r.tree_level IS NOT NULL
ORDER BY r.tree_level NULLS FIRST;
# 修改 act_id_user
......@@ -208,4 +227,15 @@ su.email AS EMAIL_,
su.login_pwd AS PWD_,
NULL :: text AS PICTURE_ID_
FROM
t_sys_user su;
\ No newline at end of file
t_sys_user su;
# 待上线
# 承包商所属企业多选
ALTER TABLE t_contractor_ledger
ALTER COLUMN org_id TYPE TEXT;
# 东北港口平台大区发起危险作业走的流程和散粮部一样
update t_sys_config set config_value = '51555a47ff6a42c0a75814fee3e60676,5c7b5e799ae6482bae0ca375e64210de,640323dc46334c8d8467a6d1889f90b1,74ba35d937a3403ca59e37d238a0d93f,bf729a8807ae4804baf5b719889a1b10,dafc181b7b314f8fb26c277afcbfeafc,8be46ac128e24c658ebc890f9da7818a,1335dbc3f81b4919bf59014fede4819d'
where config_id = '1'
\ No newline at end of file
zlmy-modules/zlmy-boot/src/main/java/com/testor/module/hazard/service/impl/THazardAssessmentServiceImpl.java
View file @ fb0bd97b
......@@ -72,6 +72,17 @@ public class THazardAssessmentServiceImpl extends SuperServiceImpl<THazardAssess
//作业地点
tHazardAssessmentDTO.setWorkLocation(tHazardWorkPlan.getWorkLocation());
List<THazardAssessmentDetails> assessmentId = tHazardAssessmentDetailsService.list(new QueryWrapper<THazardAssessmentDetails>().eq("assessment_id", tHazardAssessment.getId()));
for(THazardAssessmentDetails tHazardAssessmentDetails : assessmentId){
if(StringUtils.isEmpty(tHazardAssessmentDetails.getConsequence())){
tHazardAssessmentDetails.setConsequence("");
}
if(StringUtils.isEmpty(tHazardAssessmentDetails.getControlMeasures())){
tHazardAssessmentDetails.setControlMeasures("");
}
if(StringUtils.isEmpty(tHazardAssessmentDetails.getMajorRisk())){
tHazardAssessmentDetails.setMajorRisk("");
}
}
tHazardAssessmentDTO.setTHazardAssessmentDetails(assessmentId);
return tHazardAssessmentDTO;
}
......
zlmy-modules/zlmy-boot/src/main/java/com/testor/module/hazard/service/impl/THazardWorkPlanServiceImpl.java
View file @ fb0bd97b
......@@ -199,10 +199,16 @@ public class THazardWorkPlanServiceImpl extends SuperServiceImpl<THazardWorkPlan
tHazardWorkPlanDTO.setProjectLeaderName(getUserNamesByUserIds(projectLeader));
//监护人
String guardian = tHazardWorkPlanDTO.getGuardian();
tHazardWorkPlanDTO.setGuardianName(getUserNamesByUserIds(guardian));
log.info("guardian-------->"+guardian);
if(!StringUtils.isEmpty(guardian)){
tHazardWorkPlanDTO.setGuardianName(getUserNamesByUserIds(guardian));
}
//监督人
String supervisor = tHazardWorkPlanDTO.getSupervisor();
tHazardWorkPlanDTO.setSupervisorName(getUserNamesByUserIds(supervisor));
if(!StringUtils.isEmpty(supervisor)){
tHazardWorkPlanDTO.setSupervisorName(getUserNamesByUserIds(supervisor));
}
//作业人
String operator = tHazardWorkPlanDTO.getOperator();
tHazardWorkPlanDTO.setOperatorName(getUserNamesByUserIds(operator));
......@@ -1698,7 +1704,11 @@ public class THazardWorkPlanServiceImpl extends SuperServiceImpl<THazardWorkPlan
return tContractorPerson.getName();
}
} else {
return split[1];
log.info("split-------->"+split);
if(split.length>1){
return split[1];
}
return null;
}
}
return null;
......@@ -1876,11 +1886,17 @@ public class THazardWorkPlanServiceImpl extends SuperServiceImpl<THazardWorkPlan
//查询下级机构id
queryWrapper.in(THazardWorkPlan.ORG_ID, idsChildrenById);*/
List<String> list = Arrays.stream(queryParam.getOrgId().split(","))
.filter(s -> !s.trim().isEmpty()) // 忽略空值
.collect(Collectors.toList());
List<String> idsChildrenById = new ArrayList<>();
for(String orgId:list){
idsChildrenById.addAll(newSysOrgService.getIdsChildrenById(orgId));
}
idsChildrenById.addAll(list);
//查询下级机构id
queryWrapper.in(THazardWorkPlan.ORG_ID, list);
queryWrapper.in(THazardWorkPlan.ORG_ID, idsChildrenById);
}
if (StringHelper.isNotEmpty(queryParam.getStatus())) {
queryWrapper.eq(THazardWorkPlan.STATUS, queryParam.getStatus());
......
zlmy-modules/zlmy-boot/src/main/java/com/testor/module/safe/model/vo/TSafeHazardExportVO.java
View file @ fb0bd97b
......@@ -71,7 +71,8 @@ public class TSafeHazardExportVO {
@ExcelProperty(value = "检查日期", index = 14, converter = LocalDateTimeConverter.class)
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createDate;
//private Date createDate;
private LocalDateTime createDate;
@ExcelProperty(value = "整改措施", index = 15)
private String rectificationReform;
......
zlmy-modules/zlmy-boot/src/main/java/com/testor/module/safe/service/impl/TSafeHazardOrgServiceImpl.java
View file @ fb0bd97b
......@@ -3,7 +3,13 @@ package com.testor.module.safe.service.impl;
import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.EasyExcelFactory;
import com.alibaba.excel.ExcelWriter;
import com.alibaba.excel.converters.Converter;
import com.alibaba.excel.enums.CellDataTypeEnum;
import com.alibaba.excel.metadata.CellData;
import com.alibaba.excel.metadata.GlobalConfiguration;
import com.alibaba.excel.metadata.property.ExcelContentProperty;
import com.alibaba.excel.write.metadata.WriteSheet;
import com.alibaba.excel.write.metadata.fill.FillConfig;
import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
......@@ -93,7 +99,9 @@ import java.net.HttpURLConnection;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLEncoder;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeParseException;
import java.util.*;
......@@ -729,7 +737,7 @@ public class TSafeHazardOrgServiceImpl extends SuperServiceImpl<TSafeHazardOrgDa
@Autowired
private ProcessInstanceController processInstanceController;
@SneakyThrows
/*@SneakyThrows
@Override
public Boolean exportEntity(TSafeHazardOrgParam param, HttpServletResponse response) {
try {
......@@ -769,6 +777,72 @@ public class TSafeHazardOrgServiceImpl extends SuperServiceImpl<TSafeHazardOrgDa
WriteSheet dealerSheet = EasyExcel.writerSheet(0, "隐患台账")
.registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()).head(TSafeHazardExportVO.class).build();
ExcelWriter build = EasyExcelFactory.write(response.getOutputStream()).build();
build.write(tSafeHazardExportVOS,dealerSheet);
build.finish();
*//*InputStream templatePathName = this.getClass().getClassLoader().getResourceAsStream("excel/tzdc.xlsx");
ByteArrayOutputStream out = new ByteArrayOutputStream();
ExcelWriter excelWriter = EasyExcel.write(out).withTemplate(templatePathName).registerConverter(new LocalDateTimeConverter()).build();
WriteSheet writeSheet = EasyExcel.writerSheet().build();
FillConfig fillConfig = FillConfig.builder().forceNewRow(Boolean.TRUE).build();
excelWriter.fill(tSafeHazardExportVOS, fillConfig, writeSheet);
excelWriter.finish();
byte[] bytes = out.toByteArray();
out.flush();
out.close();
OutputStream outputStream = response.getOutputStream();
outputStream.write(bytes);
outputStream.flush();
outputStream.close();*//*
} catch (Exception e) {
e.printStackTrace();
}
return true;
}*/
@SneakyThrows
@Override
public Boolean exportEntity(TSafeHazardOrgParam param, HttpServletResponse response) {
try {
String orgId = param.getOrgId();
if (StringUtils.isBlank(orgId)) {
orgId = ContextUtils.getLoginUser().getOrgId();
}
List<String> orgIds = new ArrayList<>();
String finalOrgId = orgId;
if (param.getCondOrgIdList() != null && param.getCondOrgIdList().size() > 0) {
orgIds = param.getCondOrgIdList();
}else {
if (param.isThisOrg()) {
orgIds.add(orgId);
} else {
orgIds = sysOrgService.list(new QueryWrapper<SysOrg>().like(SysOrg.PARENT_IDS, finalOrgId).ne(SysOrg.STATUS, BizConstants.STATUS_DELETE).eq(SysOrg.IS_DEPT, 0).orderByAsc("tree_sort"))
.stream().map(SysOrg::getOrgId).collect(Collectors.toList());
if (orgIds == null || orgIds.size() == 0) {
//存入当前机构
orgIds.add(finalOrgId);
}
}
}
param.setCondOrgIdList(orgIds);
List<TSafeHazardExportVO> tSafeHazardExportVOS = exportBuild(param);
logger.info("**************************************写入模板*****************************");
// response.setContentType("application/vnd.ms-excel");
// response.setCharacterEncoding("utf-8");
// String fileName = URLEncoder.encode("隐患台账", "utf-8");
// response.setHeader("Content-Disposition", "attachment;filename=" + fileName + ".xlsx");
// response.addHeader("Pargam", "no-cache");
// response.addHeader("Cache-Control", "no-cache");
String fileName = "隐患台账";
response.setContentType("application/vnd.ms-excel;charset=utf-8");
response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(fileName, "UTF-8") + ".xlsx");
WriteSheet dealerSheet = EasyExcel.writerSheet(0, "隐患台账")
.registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()).head(TSafeHazardExportVO.class).build();
......@@ -776,7 +850,7 @@ public class TSafeHazardOrgServiceImpl extends SuperServiceImpl<TSafeHazardOrgDa
build.write(tSafeHazardExportVOS,dealerSheet);
build.finish();
/*InputStream templatePathName = this.getClass().getClassLoader().getResourceAsStream("excel/tzdc.xlsx");
InputStream templatePathName = this.getClass().getClassLoader().getResourceAsStream("excel/tzdc.xlsx");
ByteArrayOutputStream out = new ByteArrayOutputStream();
ExcelWriter excelWriter = EasyExcel.write(out).withTemplate(templatePathName).registerConverter(new LocalDateTimeConverter()).build();
WriteSheet writeSheet = EasyExcel.writerSheet().build();
......@@ -789,7 +863,7 @@ public class TSafeHazardOrgServiceImpl extends SuperServiceImpl<TSafeHazardOrgDa
OutputStream outputStream = response.getOutputStream();
outputStream.write(bytes);
outputStream.flush();
outputStream.close();*/
outputStream.close();
} catch (Exception e) {
e.printStackTrace();
}
......@@ -815,6 +889,7 @@ public class TSafeHazardOrgServiceImpl extends SuperServiceImpl<TSafeHazardOrgDa
if (StringUtils.isBlank(nature)){
nature = String.valueOf(byId.getTreeLevel());
}
/*if ( byId.getTreeLevel().toString().equals("2")){
tSafeHazardExportVO.setRegionalUnits(byId.getOrgName());
}else if (byId.getTreeLevel().toString().equals("3")){
......
zlmy-modules/zlmy-boot/src/main/java/com/testor/module/sys/controller/NewSysOrgController.java
View file @ fb0bd97b
......@@ -548,7 +548,7 @@ public class NewSysOrgController extends SuperController {
for(SysOrg org : list) {
ReturnOrg returnOrg1 = BeanHelper.beanToBean(org, ReturnOrg.class);
List<SysUser> list1 = this.sysUserService.list(new QueryWrapper<SysUser>().eq("dept_id", returnOrg1.getOrgId()).ne("status", "1"));
List<SysUser> list1 = this.sysUserService.list(new QueryWrapper<SysUser>().eq("dept_id", returnOrg1.getOrgId()).eq("status", "0"));
returnOrg1.setUsers(list1);
returnOrgs.add(returnOrg1);
}
......
zlmy-modules/zlmy-boot/src/main/resources/application.yml
View file @ fb0bd97b
......@@ -97,6 +97,7 @@ tiny:
path: tinyFile/
url: /tinyFile/
# 人员资质定时任务,打166包时设为false
service:
taskEnabled: true
......
zlmy-modules/zlmy-boot/src/main/resources/mapper/contractor/ledger/TContractorLedger.xml
View file @ fb0bd97b
......@@ -33,10 +33,23 @@
<id column="man_policies" property="manPolicies"/>
</resultMap>
<select id="pageList" resultType="com.testor.module.contractor.ledger.model.domain.TContractorLedger">
select t.* from t_contractor_ledger t left join t_contractor_info tci on t.info_id=tci.id
<!--select t.* from t_contractor_ledger t left join t_contractor_info tci on t.info_id=tci.id
where t.org_id IN (select org.org_id from t_sys_org org where org.parent_ids like
concat('%',#{param.orgId},'%') or org.org_id = #{param.orgId})
and t.status = '0'
and t.status = '0'-->
SELECT t.*
FROM t_contractor_ledger t
LEFT JOIN t_contractor_info tci ON t.info_id = tci.id
WHERE EXISTS (
SELECT 1
FROM unnest(string_to_array(t.org_id, ',')) AS org(id)
JOIN t_sys_org o ON org.id = o.org_id
WHERE
o.parent_ids LIKE concat('%',#{param.orgId},'%')
OR o.org_id = #{param.orgId}
)
AND t.status = '0'
<if test="param.name != null and param.name != ''">
AND tci.name like concat('%',#{param.name},'%')
</if>
......
zlmy-modules/zlmy-boot/src/main/resources/mapper/mq/WeatherDao.xml
View file @ fb0bd97b
......@@ -7,7 +7,7 @@
select id, signal_type_code as code,record_time as warnTime,sender,signal_level_code as colorMsg,sender_area_code as
areaCode from t_weather_notice
<where>
TO_CHAR(record_time)>=#{date}
record_time>=#{date}
<if test="list != null and list.size()>0">
AND sender_area_code IN
<foreach item="item" index="index" collection="list" open="(" close=")" separator=",">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment