Skip to content

Q
qianhe-hyqd
Commit f1ed8dc2 by jiang'yun
Options

首次提交

parent ee986028
Showing with 355 additions and 99 deletions
ruoyi-admin/src/main/java/com/ruoyi/system/controller/HyjlController.java
package com.ruoyi.system.controller; package com.ruoyi.system.controller;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.URLEncoder;
import java.util.Calendar;
import java.util.Date;
import java.util.List; import java.util.List;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.system.mapper.HyjlMapper; import com.ruoyi.system.mapper.HyjlMapper;
import org.apache.poi.openxml4j.util.ZipSecureFile;
import org.apache.poi.ss.usermodel.*;
import org.springframework.http.MediaType;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
...@@ -47,7 +49,7 @@ public class HyjlController extends BaseController ...@@ -47,7 +49,7 @@ public class HyjlController extends BaseController
public TableDataInfo list(Hyjl hyjl) public TableDataInfo list(Hyjl hyjl)
{ {
startPage(); startPage();
List<Hyjl> list = hyjlService.selectHyjlList(hyjl); List<Hyjl> list = hyjlService.selectHyjlList2(hyjl);
return getDataTable(list); return getDataTable(list);
} }
...@@ -64,6 +66,151 @@ public class HyjlController extends BaseController ...@@ -64,6 +66,151 @@ public class HyjlController extends BaseController
util.exportExcel(response, list, "会议记录数据"); util.exportExcel(response, list, "会议记录数据");
} }
/**
* 导出装备台账
*/
@Log(title = "导出装备台账", businessType = BusinessType.EXPORT)
@RequestMapping(value = "/exportJl", method = {RequestMethod.GET, RequestMethod.POST})
public void exportJl(HttpServletResponse response, Hyjl hyjl) throws Exception
{
Workbook exl = null;
OutputStream out = null;
InputStream in = null;
try {
hyjl.setDeptLx("新春公司");
List<Hyjl> list = hyjlService.selectHyjlList2(hyjl);
in =this.getClass().getResourceAsStream("/static/excel/hyqdb.xlsx");
ZipSecureFile.setMinInflateRatio(0.001);
exl = WorkbookFactory.create(in);
out = response.getOutputStream();
response.reset();
String filename = URLEncoder.encode("会议签到表.xlsx", "UTF-8");
response.setCharacterEncoding("UTF-8");
response.setHeader("Content-Disposition", "attachment;filename=" + filename);
response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
//新春公司
Sheet sheet = exl.getSheet("新春签到表");
CellStyle cellStyle = exl.createCellStyle();
cellStyle.setAlignment(HorizontalAlignment.CENTER);
cellStyle.setVerticalAlignment(VerticalAlignment.CENTER);
cellStyle.setBorderBottom(BorderStyle.THIN); //下边框
cellStyle.setBorderLeft(BorderStyle.THIN);//左边框
cellStyle.setBorderTop(BorderStyle.THIN);//上边框
cellStyle.setBorderRight(BorderStyle.THIN);//右边框
cellStyle.setBottomBorderColor(IndexedColors.BLACK.getIndex());
cellStyle.setLeftBorderColor(IndexedColors.BLACK.getIndex());
cellStyle.setRightBorderColor(IndexedColors.BLACK.getIndex());
cellStyle.setTopBorderColor(IndexedColors.BLACK.getIndex());
Font cellFont = exl.createFont();
cellFont.setFontHeightInPoints((short)14); // 字体大小
cellFont.setFontName("宋体"); // 字体应用到当前单元格上
cellStyle.setFont(cellFont);
cellStyle.setWrapText(true);//设置自动换行
int lastRow = sheet.getLastRowNum()+1;
int n=1;
for(int i =0;i<list.size();i++){
Hyjl item = list.get(i);
Row rows = sheet.createRow(lastRow);
rows.setHeight((short)500);
//序号
int m = 0;
Cell cell31 = rows.createCell(m++);
cell31.setCellStyle(cellStyle);
cell31.setCellValue(n++);
Cell cell3 = rows.createCell(m++);
cell3.setCellStyle(cellStyle);
cell3.setCellValue(item.getDwmc());
Cell cell32 = rows.createCell(m++);
cell32.setCellStyle(cellStyle);
cell32.setCellValue(item.getDyryxx());
Cell cell33 = rows.createCell(m++);
cell33.setCellStyle(cellStyle);
cell33.setCellValue(item.getWlmqryxx());
Cell cell35 = rows.createCell(m++);
cell35.setCellStyle(cellStyle);
cell35.setCellValue(item.getGlqryxx());
Cell cell36 = rows.createCell(m++);
cell36.setCellStyle(cellStyle);
cell36.setCellValue(item.getQjryxx());
Cell cell322 = rows.createCell(m++);
cell322.setCellStyle(cellStyle);
lastRow++;
}
hyjl.setDeptLx("外协单位");
List<Hyjl> listwx = hyjlService.selectHyjlList2(hyjl);
Sheet sheetwx = exl.getSheet("外协单位签到表");
int lastRowwx = sheetwx.getLastRowNum()+1;
int nwx=1;
for(int i =0;i<listwx.size();i++){
Hyjl item = listwx.get(i);
Row rows = sheetwx.createRow(lastRowwx);
rows.setHeight((short)500);
//序号
int m = 0;
Cell cell31 = rows.createCell(m++);
cell31.setCellStyle(cellStyle);
cell31.setCellValue(nwx++);
Cell cell3 = rows.createCell(m++);
cell3.setCellStyle(cellStyle);
cell3.setCellValue(item.getDwmc());
Cell cell32 = rows.createCell(m++);
cell32.setCellStyle(cellStyle);
cell32.setCellValue(item.getDyryxx());
Cell cell33 = rows.createCell(m++);
cell33.setCellStyle(cellStyle);
cell33.setCellValue(item.getWlmqryxx());
Cell cell35 = rows.createCell(m++);
cell35.setCellStyle(cellStyle);
cell35.setCellValue(item.getGlqryxx());
Cell cell36 = rows.createCell(m++);
cell36.setCellStyle(cellStyle);
cell36.setCellValue(item.getQjryxx());
Cell cell322 = rows.createCell(m++);
cell322.setCellStyle(cellStyle);
lastRow++;
}
exl.write(out);
exl.close();
}catch (Exception e){
e.getMessage();
e.printStackTrace();
throw new Exception("导出Excel失败，请联系网站管理员！");
}finally {
if (exl != null) {
try {
exl.close();
} catch (IOException e1) {
e1.printStackTrace();
}
}
if (out != null) {
try {
out.close();
} catch (IOException e1) {
e1.printStackTrace();
}
}
}
}
/** /**
* 获取会议记录详细信息 * 获取会议记录详细信息
*/ */
...@@ -82,7 +229,15 @@ public class HyjlController extends BaseController ...@@ -82,7 +229,15 @@ public class HyjlController extends BaseController
@PostMapping @PostMapping
public AjaxResult add(@RequestBody Hyjl hyjl) public AjaxResult add(@RequestBody Hyjl hyjl)
{ {
hyjl.setCjsj2(DateUtils.dateTimeNow("yyyy-MM-dd")); //计算当前时间的前两个小时
Date nowDate = DateUtils.getNowDate();
Calendar instance = Calendar.getInstance();
instance.setTime(nowDate);
instance.add(Calendar.HOUR,-2);
String s = DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", instance.getTime());
hyjl.setCjsj2(s);
Hyjl hl=hyjlMapper.selectHyjlOne(hyjl); Hyjl hl=hyjlMapper.selectHyjlOne(hyjl);
if(hl!=null){ if(hl!=null){
return AjaxResult.error("已有参会记录，不允许重复提交"); return AjaxResult.error("已有参会记录，不允许重复提交");
...@@ -90,6 +245,16 @@ public class HyjlController extends BaseController ...@@ -90,6 +245,16 @@ public class HyjlController extends BaseController
return toAjax(hyjlService.insertHyjl(hyjl)); return toAjax(hyjlService.insertHyjl(hyjl));
} }
public static void main(String[] args) {
Date nowDate = DateUtils.getNowDate();
Calendar instance = Calendar.getInstance();
instance.setTime(nowDate);
instance.add(Calendar.SECOND,-60);
String s = DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", instance.getTime());
System.out.println(s);
}
/** /**
* 修改会议记录 * 修改会议记录
*/ */
......
ruoyi-admin/src/main/java/com/ruoyi/system/controller/RyxxController.java
...@@ -5,7 +5,9 @@ import java.util.List; ...@@ -5,7 +5,9 @@ import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.system.domain.Dwxx; import com.ruoyi.system.domain.Dwxx;
import com.ruoyi.system.mapper.SysDictDataMapper;
import com.ruoyi.system.service.IDwxxService; import com.ruoyi.system.service.IDwxxService;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -41,6 +43,9 @@ public class RyxxController extends BaseController ...@@ -41,6 +43,9 @@ public class RyxxController extends BaseController
@Autowired @Autowired
private IDwxxService dwxxService; private IDwxxService dwxxService;
@Autowired
private SysDictDataMapper sysDictDataMapper;
/** /**
* 查询人员信息列表 * 查询人员信息列表
*/ */
...@@ -49,6 +54,8 @@ public class RyxxController extends BaseController ...@@ -49,6 +54,8 @@ public class RyxxController extends BaseController
public TableDataInfo list(Ryxx ryxx) public TableDataInfo list(Ryxx ryxx)
{ {
// startPage(); // startPage();
//查询部门类型
List<SysDictData> deptLx = sysDictDataMapper.selectDictDataByType("dept_lx");
List<Ryxx> list = ryxxService.selectRyxxList(ryxx); List<Ryxx> list = ryxxService.selectRyxxList(ryxx);
List<Dwxx> dwxxList = dwxxService.selectDwxxList(new Dwxx()); List<Dwxx> dwxxList = dwxxService.selectDwxxList(new Dwxx());
List<Ryxx> relist = new ArrayList<>(); List<Ryxx> relist = new ArrayList<>();
...@@ -56,12 +63,22 @@ public class RyxxController extends BaseController ...@@ -56,12 +63,22 @@ public class RyxxController extends BaseController
Ryxx ryxx1=new Ryxx(); Ryxx ryxx1=new Ryxx();
ryxx1.setId(item.getId()); ryxx1.setId(item.getId());
ryxx1.setText(item.getDwmc()); ryxx1.setText(item.getDwmc());
ryxx1.setLx(item.getLx());
List<Ryxx> collect = list.stream().filter(ry -> ry.getDwid().toString().equals(item.getId().toString() )).collect(Collectors.toList()); List<Ryxx> collect = list.stream().filter(ry -> ry.getDwid().toString().equals(item.getId().toString() )).collect(Collectors.toList());
ryxx1.setChildren(collect); ryxx1.setChildren(collect);
relist.add(ryxx1); relist.add(ryxx1);
}); });
List<Ryxx> relist2 = new ArrayList<>();
deptLx.forEach(item->{
Ryxx ryxx1=new Ryxx();
ryxx1.setId(item.getDictCode());
ryxx1.setText(item.getDictValue());
List<Ryxx> collect = relist.stream().filter(ry->ry.getLx().equals(item.getDictValue())).collect(Collectors.toList());
ryxx1.setChildren(collect);
relist2.add(ryxx1);
});
return getDataTable(relist); return getDataTable(relist2);
} }
/** /**
......
ruoyi-admin/src/main/java/com/ruoyi/system/domain/Dwxx.java
package com.ruoyi.system.domain; package com.ruoyi.system.domain;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;
...@@ -11,6 +12,7 @@ import com.ruoyi.common.core.domain.BaseEntity; ...@@ -11,6 +12,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
* @author ruoyi * @author ruoyi
* @date 2024-10-30 * @date 2024-10-30
*/ */
@Data
public class Dwxx extends BaseEntity public class Dwxx extends BaseEntity
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -26,6 +28,7 @@ public class Dwxx extends BaseEntity ...@@ -26,6 +28,7 @@ public class Dwxx extends BaseEntity
@Excel(name = "备注") @Excel(name = "备注")
private String bz; private String bz;
private String lx;
public void setId(Long id) public void setId(Long id)
{ {
this.id = id; this.id = id;
......
ruoyi-admin/src/main/java/com/ruoyi/system/domain/Hyjl.java
...@@ -56,80 +56,15 @@ public class Hyjl extends BaseEntity ...@@ -56,80 +56,15 @@ public class Hyjl extends BaseEntity
private String cjsj2; private String cjsj2;
public void setId(Long id)
{
this.id = id; private String deptLx;
} private String dyryxx;
private String wlmqryxx;
public Long getId() private String klmyryxx;
{ private String glqryxx;
return id; private String cfjdryxx;
} private String wehryxx;
public void setDwid(String dwid) private String qjryxx;
{
this.dwid = dwid;
}
public String getDwid()
{
return dwid;
}
public void setRyxx(String ryxx)
{
this.ryxx = ryxx;
}
public String getRyxx()
{
return ryxx;
}
public void setChdd(String chdd)
{
this.chdd = chdd;
}
public String getChdd()
{
return chdd;
}
public void setSfqj(String sfqj)
{
this.sfqj = sfqj;
}
public String getSfqj()
{
return sfqj;
}
public void setQjyy(String qjyy)
{
this.qjyy = qjyy;
}
public String getQjyy()
{
return qjyy;
}
public void setBz(String bz)
{
this.bz = bz;
}
public String getBz()
{
return bz;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("dwid", getDwid())
.append("ryxx", getRyxx())
.append("chdd", getChdd())
.append("sfqj", getSfqj())
.append("qjyy", getQjyy())
.append("bz", getBz())
.toString();
}
} }
ruoyi-admin/src/main/java/com/ruoyi/system/domain/Ryxx.java
...@@ -74,6 +74,8 @@ public class Ryxx extends BaseEntity ...@@ -74,6 +74,8 @@ public class Ryxx extends BaseEntity
private String text; private String text;
private String lx;
public void setId(Long id) public void setId(Long id)
{ {
this.id = id; this.id = id;
......
ruoyi-admin/src/main/java/com/ruoyi/system/mapper/HyjlMapper.java
...@@ -62,4 +62,6 @@ public interface HyjlMapper ...@@ -62,4 +62,6 @@ public interface HyjlMapper
Hyjl selectHyjlOne(Hyjl hyjl); Hyjl selectHyjlOne(Hyjl hyjl);
List<Hyjl> selectHyjlList2(Hyjl hyjl);
} }
ruoyi-admin/src/main/java/com/ruoyi/system/service/IHyjlService.java
...@@ -58,4 +58,8 @@ public interface IHyjlService ...@@ -58,4 +58,8 @@ public interface IHyjlService
* @return 结果 * @return 结果
*/ */
public int deleteHyjlById(Long id); public int deleteHyjlById(Long id);
List<Hyjl> selectHyjlList2(Hyjl hyjl);
} }
ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/HyjlServiceImpl.java
...@@ -103,4 +103,9 @@ public class HyjlServiceImpl implements IHyjlService ...@@ -103,4 +103,9 @@ public class HyjlServiceImpl implements IHyjlService
{ {
return hyjlMapper.deleteHyjlById(id); return hyjlMapper.deleteHyjlById(id);
} }
@Override
public List<Hyjl> selectHyjlList2(Hyjl hyjl) {
return hyjlMapper.selectHyjlList2(hyjl);
}
} }
ruoyi-admin/src/main/resources/application-druid.yml
...@@ -6,9 +6,9 @@ spring: ...@@ -6,9 +6,9 @@ spring:
druid: druid:
# 主库数据源 # 主库数据源
master: master:
url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 url: jdbc:mysql://192.168.31.167:3306/qianhe_hyqd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&failOverReadOnly=false
username: root username: root
password: password password: qianhe2024
# 从库数据源 # 从库数据源
slave: slave:
# 从数据源开关/默认关闭 # 从数据源开关/默认关闭
......
ruoyi-admin/src/main/resources/application-prod.yml 0 → 100644
# 数据源配置
spring:
datasource:
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
druid:
# 主库数据源
master:
url: jdbc:mysql://1.116.38.25:3986/qianhe_hyqd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&failOverReadOnly=false
username: root
password: qianhe2022
# 从库数据源
slave:
# 从数据源开关/默认关闭
enabled: false
url:
username:
password:
# 初始连接数
initialSize: 5
# 最小连接池数量
minIdle: 10
# 最大连接池数量
maxActive: 20
# 配置获取连接等待超时的时间
maxWait: 60000
# 配置连接超时时间
connectTimeout: 30000
# 配置网络超时时间
socketTimeout: 60000
# 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
timeBetweenEvictionRunsMillis: 60000
# 配置一个连接在池中最小生存的时间，单位是毫秒
minEvictableIdleTimeMillis: 300000
# 配置一个连接在池中最大生存的时间，单位是毫秒
maxEvictableIdleTimeMillis: 900000
# 配置检测连接是否有效
validationQuery: SELECT 1 FROM DUAL
testWhileIdle: true
testOnBorrow: false
testOnReturn: false
webStatFilter:
enabled: true
statViewServlet:
enabled: true
# 设置白名单，不填则允许所有访问
allow:
url-pattern: /druid/*
# 控制台管理用户名和密码
login-username: ruoyi
login-password: 123456
filter:
stat:
enabled: true
# 慢SQL记录
log-slow-sql: true
slow-sql-millis: 1000
merge-sql: true
wall:
config:
multi-statement-allow: true
\ No newline at end of file
ruoyi-admin/src/main/resources/application.yml
...@@ -16,7 +16,7 @@ ruoyi: ...@@ -16,7 +16,7 @@ ruoyi:
# 开发环境配置 # 开发环境配置
server: server:
# 服务器的HTTP端口，默认为8080 # 服务器的HTTP端口，默认为8080
port: 8080 port: 8084
servlet: servlet:
# 应用的访问路径 # 应用的访问路径
context-path: / context-path: /
...@@ -53,6 +53,7 @@ spring: ...@@ -53,6 +53,7 @@ spring:
basename: i18n/messages basename: i18n/messages
profiles: profiles:
active: druid active: druid
# active: prod
# 文件上传 # 文件上传
servlet: servlet:
multipart: multipart:
...@@ -68,13 +69,11 @@ spring: ...@@ -68,13 +69,11 @@ spring:
# redis 配置 # redis 配置
redis: redis:
# 地址 # 地址
host: localhost host: 1.116.38.25
# 端口，默认为6379 # 端口，默认为6379
port: 6379 port: 7789
# 数据库索引 # # 密码
database: 0 password: qianheRedis2021
# 密码
password:
# 连接超时时间 # 连接超时时间
timeout: 10s timeout: 10s
lettuce: lettuce:
...@@ -87,6 +86,7 @@ spring: ...@@ -87,6 +86,7 @@ spring:
max-active: 8 max-active: 8
# #连接池最大阻塞等待时间（使用负值表示没有限制） # #连接池最大阻塞等待时间（使用负值表示没有限制）
max-wait: -1ms max-wait: -1ms
database: 5
# token配置 # token配置
token: token:
......
ruoyi-admin/src/main/resources/mapper/system/DwxxMapper.xml
...@@ -8,10 +8,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -8,10 +8,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="id" column="id" /> <result property="id" column="id" />
<result property="dwmc" column="dwmc" /> <result property="dwmc" column="dwmc" />
<result property="bz" column="bz" /> <result property="bz" column="bz" />
<result property="lx" column="lx" />
</resultMap> </resultMap>
<sql id="selectDwxxVo"> <sql id="selectDwxxVo">
select id, dwmc, bz from dwxx select id, dwmc, bz,lx from dwxx
</sql> </sql>
<select id="selectDwxxList" parameterType="Dwxx" resultMap="DwxxResult"> <select id="selectDwxxList" parameterType="Dwxx" resultMap="DwxxResult">
......
ruoyi-admin/src/main/resources/mapper/system/HyjlMapper.xml
...@@ -41,7 +41,67 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -41,7 +41,67 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where id = #{id} where id = #{id}
</select> </select>
<select id="selectHyjlOne" resultType="com.ruoyi.system.domain.Hyjl"> <select id="selectHyjlOne" resultType="com.ruoyi.system.domain.Hyjl">
select * from hyjl where dwid=#{dwid} and ryxx=#{ryxx} and date_format(cjsj,'%Y-%m-%d') = #{cjsj2} select * from hyjl where dwid=#{dwid} and ryxx=#{ryxx} and date_format(cjsj,'%Y-%m-%d %H:%i:%s') >= #{cjsj2}
</select>
<select id="selectHyjlList2" resultType="com.ruoyi.system.domain.Hyjl">
select a.id,a.dwmc,b.chdd ,dyryxx,wlmqryxx,klmyryxx,glqryxx,cfjdryxx,wehryxx,qjryxx from dwxx a
left join (
select dwid,group_concat(ryxx) dyryxx,chdd
from hyjl where sfqj='否' and chdd='东营'
<if test="ryxx != null and ryxx != ''"> and ryxx like concat('%', #{ryxx}, '%')</if>
<if test="cjsj2 != null and cjsj2 != ''"> and date_format(cjsj,'%Y-%m-%d') = #{cjsj2}</if>
group by dwid
) b on a.id=b.dwid
left join (
select dwid,group_concat(ryxx) wlmqryxx,chdd
from hyjl where sfqj='否' and chdd='乌鲁木齐'
<if test="ryxx != null and ryxx != ''"> and ryxx like concat('%', #{ryxx}, '%')</if>
<if test="cjsj2 != null and cjsj2 != ''"> and date_format(cjsj,'%Y-%m-%d') = #{cjsj2}</if>
group by dwid
) c on a.id=c.dwid
left join (
select dwid,group_concat(ryxx) klmyryxx,chdd
from hyjl where sfqj='否' and chdd='克拉玛依'
<if test="ryxx != null and ryxx != ''"> and ryxx like concat('%', #{ryxx}, '%')</if>
<if test="cjsj2 != null and cjsj2 != ''"> and date_format(cjsj,'%Y-%m-%d') = #{cjsj2}</if>
group by dwid
) d on a.id=d.dwid
left join (
select dwid,group_concat(ryxx) glqryxx,chdd
from hyjl where sfqj='否' and chdd='管理二区'
<if test="ryxx != null and ryxx != ''"> and ryxx like concat('%', #{ryxx}, '%')</if>
<if test="cjsj2 != null and cjsj2 != ''"> and date_format(cjsj,'%Y-%m-%d') = #{cjsj2}</if>
group by dwid
) e on a.id=e.dwid
left join (
select dwid,group_concat(ryxx) cfjdryxx,chdd
from hyjl where sfqj='否' and chdd='春风基地'
<if test="ryxx != null and ryxx != ''"> and ryxx like concat('%', #{ryxx}, '%')</if>
<if test="cjsj2 != null and cjsj2 != ''"> and date_format(cjsj,'%Y-%m-%d') = #{cjsj2}</if>
group by dwid
) f on a.id=f.dwid
left join (
select dwid,group_concat(ryxx) wehryxx,chdd
from hyjl where sfqj='否' and chdd='乌尔禾'
<if test="ryxx != null and ryxx != ''"> and ryxx like concat('%', #{ryxx}, '%')</if>
<if test="cjsj2 != null and cjsj2 != ''"> and date_format(cjsj,'%Y-%m-%d') = #{cjsj2}</if>
group by dwid
) g on a.id=g.dwid
left join (
select dwid,group_concat(ryxx) qjryxx,chdd
from hyjl where sfqj='是'
<if test="ryxx != null and ryxx != ''"> and ryxx like concat('%', #{ryxx}, '%')</if>
<if test="cjsj2 != null and cjsj2 != ''"> and date_format(cjsj,'%Y-%m-%d') = #{cjsj2}</if>
group by dwid
) k on a.id=k.dwid
where 1=1
<if test="deptLx != null and deptLx != ''"> and a.lx =#{deptLx}</if>
order by a.px
</select> </select>
<insert id="insertHyjl" parameterType="Hyjl" useGeneratedKeys="true" keyProperty="id"> <insert id="insertHyjl" parameterType="Hyjl" useGeneratedKeys="true" keyProperty="id">
......
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