guoyuepeng
/
qa-prevention-gwj
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

动土作业迁移

pull/3/head
zhaoyu 2023-12-12 15:25:59 +08:00
parent 486a95acdb
commit f338b750da
7 changed files with 919 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

223
src/main/java/com/zcloud/controller/gf/AppGFBreakGroundController.java
View File

@ -5,17 +5,20 @@ import com.alibaba.fastjson.JSONObject;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.service.gf.GFBreakGroundAcceptUserService;
import com.zcloud.service.gf.GFBreakGroundLogService;
import com.zcloud.service.gf.GFBreakGroundService;
import com.zcloud.service.gf.GFBreakGroundToMeasuresService;
import com.zcloud.util.*;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartRequest;
import javax.annotation.Resource;
import java.text.DecimalFormat;
@ -33,12 +36,16 @@ public class AppGFBreakGroundController extends BaseController {
@Resource
private GFBreakGroundService GFbreakGroundService;
@Autowired
private GFBreakGroundAcceptUserService breakgroundacceptuserService;
@Resource
private GFBreakGroundLogService GFbreakGroundLogService;
@Resource
private GFBreakGroundToMeasuresService GFbreakGroundToMeasuresService;
@Resource
private SendMessageUtil sendMessageUtil;
@Autowired
private Smb smb;
/**获取编码
* @param
* @throws Exception
@ -78,6 +85,18 @@ public class AppGFBreakGroundController extends BaseController {
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
PageData pd2 = new PageData();
Calendar calendar = Calendar.getInstance();
DecimalFormat dft=new DecimalFormat("00");
int year = calendar.get(Calendar.YEAR);
String month = dft.format(calendar.get(Calendar.MONTH) + 1);
String day = dft.format(calendar.get(Calendar.DAY_OF_MONTH));
pd2.put("CREATDATE",year + "-" + month + "-" + day);
pd2.put("CORPINFO_ID",pd.get("CORPINFO_ID"));
pd2 = GFbreakGroundService.getCode(pd2); //根据ID读取
String code = "DT"+year + month + day + dft.format((Integer.parseInt(pd2.get("code").toString())+1));
pd = this.getPageData();
pd.put("CHECK_NO", code);
pd.put("BREAKGROUND_ID", this.get32UUID()); //主键
pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间
pd.put("ISDELETE", "0"); //是否删除 1-是 0-否
@ -88,28 +107,13 @@ public class AppGFBreakGroundController extends BaseController {
String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pd.put("APPLY_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
pd.put("APPLY_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
}
GFbreakGroundService.save(pd);
GFbreakGroundToMeasuresService.delete(pd);
if(pd.get("measuresList")!=null){
List<JSONObject> list = (List<JSONObject>) JSON.parse(pd.get("measuresList").toString());
for (JSONObject json : list) {
PageData measures = new PageData();
measures.put("BREAKGROUNDTOMEASURES_ID", this.get32UUID()); // 主键
measures.put("BREAKGROUND_ID", pd.get("BREAKGROUND_ID"));
measures.put("BUS_BREAKGROUND_MEASURES_ID", json.get("BUS_BREAKGROUND_MEASURES_ID"));
measures.put("STATUS", json.get("STATUS"));
measures.put("ANSWER", json.get("ANSWER"));
measures.put("CONFIRM_ID", pd.get("OPERATOR"));
measures.put("CONFIRM_NAME", pd.get("ACTION_USER"));
GFbreakGroundToMeasuresService.save(measures);
}
}
if(pd.get("APPLY_STATUS").equals("1")) {
PageData log = new PageData();
log.put("BREAKGROUNDLOG_ID", this.get32UUID());
@ -178,7 +182,7 @@ public class AppGFBreakGroundController extends BaseController {
String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pd2.put("GUARDIAN_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
pd2.put("GUARDIAN_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
@ -210,7 +214,7 @@ public class AppGFBreakGroundController extends BaseController {
String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pd2.put("CONFESS_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
pd2.put("CONFESS_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
@ -226,9 +230,7 @@ public class AppGFBreakGroundController extends BaseController {
@RequestMapping(value="/editAcceptconfess")
@ResponseBody
@Transactional
public Object editAcceptconfess(
@RequestParam(value="FFILE",required=false) MultipartFile[] files
) throws Exception {
public Object editAcceptconfess(MultipartRequest request) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
@ -237,20 +239,46 @@ public class AppGFBreakGroundController extends BaseController {
pd2 = GFbreakGroundService.findById(pd);
pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人
pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
if (files != null && files.length > 0) {
MultipartFile file = files[0];
List<MultipartFile> fileList = new ArrayList<MultipartFile>();
String signertime = "";
String SIGNTIME[] = pd.getString("SIGNTIME").split(",");
String ffile = DateUtil.getDays();
String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pd2.put("ACCEPT_CONFESS_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
pd2.put("ACCEPT_CONFESS_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
GFbreakGroundService.edit(pd2);
for (int i = 0; i < SIGNTIME.length; i++) {
signertime = SIGNTIME[i];
fileList.add(request.getFile("file"+i));
MultipartFile[] fileArr = new MultipartFile[fileList.size()];
saveImg(fileList.toArray(fileArr),signertime,pd.getString("BREAKGROUND_ID"),pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_CONFESS_USER_ID"),pd.getString("ACCEPT_CONFESS_DEPARTMENT_ID"));
fileList.clear();
}
map.put("result", errInfo);
return map;
}
private void saveImg(MultipartFile[] files,String signertime, String BREAKGROUND_ID, String CORPINFO_ID, String ACCEPT_CONFESS_USER_ID, String ACCEPT_CONFESS_DEPARTMENT_ID) throws Exception{
if (files != null && files.length > 0) {
for (int i = 0; i < files.length; i++) {
PageData pd = new PageData();
pd = this.getPageData();
MultipartFile file = files[i];
String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
smb.sshSftp(file, fileName,Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile);
pd.put("ACCEPT_CONFESS_USER_SIGNER_TIME", signertime);
pd.put("ACCEPT_CONFESS_ID", this.get32UUID());
pd.put("OPERATOR", pd.get("OPERATOR")); //修改人
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
pd.put("ACCEPT_CONFESS_USER_SIGNER_PATH", Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile + "/" + fileName);
pd.put("ISDELETE", '0');
pd.put("CORPINFO_ID", CORPINFO_ID);
pd.put("BREAKGROUND_ID", BREAKGROUND_ID);
pd.put("ACCEPT_CONFESS_USER_ID", ACCEPT_CONFESS_USER_ID);
pd.put("ACCEPT_CONFESS_DEPARTMENT_ID", ACCEPT_CONFESS_DEPARTMENT_ID);
pd.put("ACCEPT_USER_ID","");
pd.put("ACCEPT_DEPARTMENT_ID", "");
breakgroundacceptuserService.save(pd);
}
}
}
/**上传图
* @param
* @throws Exception
@ -270,7 +298,7 @@ public class AppGFBreakGroundController extends BaseController {
String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
map.put("path", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
}
@ -291,14 +319,14 @@ public class AppGFBreakGroundController extends BaseController {
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
Smb.deleteFile(pd.getString("path"));
smb.deleteFile(pd.getString("path"));
map.put("result", errInfo);
return map;
}
/**删除
* @param out
* @param
* @throws Exception
*/
@RequestMapping(value="/delete")
@ -335,7 +363,7 @@ public class AppGFBreakGroundController extends BaseController {
String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pd.put("APPLY_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
pd.put("APPLY_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
@ -402,6 +430,105 @@ public class AppGFBreakGroundController extends BaseController {
return map;
}
/**修改
* @param
* @throws Exception
*/
@RequestMapping(value="/editAcceptStatus")
@ResponseBody
@Transactional
public Object editAcceptStatus(MultipartRequest request) throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
PageData pd2 = new PageData();
pd2 = GFbreakGroundService.findById(pd);
pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人
pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
PageData log = new PageData();
log.put("BREAKGROUNDLOG_ID", this.get32UUID());
// log.put("ACTION", "审核打回");
log.put("BREAKGROUND_ID", pd.get("BREAKGROUND_ID"));
log.put("CREATOR",pd.get("ACTION_USER"));
log.put("CREATTIME", DateUtil.date2Str(new Date()));
String status = pd.get("STATUS").toString();
String OTHER_PROTECTIVE_MEASURES = (StringUtils.isNotBlank(pd2.getString("OTHER_PROTECTIVE_MEASURES")) ? pd2.getString("OTHER_PROTECTIVE_MEASURES") : "") +
(StringUtils.isNotBlank(pd.getString("OTHER_PROTECTIVE_MEASURES")) ? (pd.getString("OTHER_PROTECTIVE_MEASURES") + ";_;") : ";_;");
String HAZARD_IDENTIFICATION = (StringUtils.isNotBlank(pd2.getString("HAZARD_IDENTIFICATION")) ? pd2.getString("HAZARD_IDENTIFICATION") : "") +
(StringUtils.isNotBlank(pd.getString("HAZARD_IDENTIFICATION")) ? (pd.getString("HAZARD_IDENTIFICATION") + ";_;") : ";_;");
//打回清空数据
pd2.put("OTHER_PROTECTIVE_MEASURES", "");
pd2.put("HAZARD_IDENTIFICATION", "");
switch (status) {
case "6"://验收人
List<MultipartFile> fileList = new ArrayList<MultipartFile>();
String signertime = "";
String SIGNTIME[] = pd.getString("SIGNTIME").split(",");
for (int i = 0; i < SIGNTIME.length; i++) {
signertime = SIGNTIME[i];
fileList.add(request.getFile("file"+i));
MultipartFile[] fileArr = new MultipartFile[fileList.size()];
saveAcceptImg(fileList.toArray(fileArr),signertime,pd.getString("BREAKGROUND_ID"),pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_USER_ID"),pd.getString("ACCEPT_DEPARTMENT_ID"));
fileList.clear();
}
pd2.put("ACCEPT_CONTENT", pd.get("CONTENT"));
pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES);
pd2.put("HAZARD_IDENTIFICATION", HAZARD_IDENTIFICATION);
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
GFbreakGroundService.edit(pd2);
log.put("ACTION", "验收通过");
// 发短信
this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2);
break;
case "-6"://审批打回
log.put("ACTION", "验收人打回");
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pd2.put("ACCEPT_CONTENT", pd.get("CONTENT"));
GFbreakGroundService.edit(pd2);
// 发短信
this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2);
break;
default:
break;
}
GFbreakGroundLogService.save(log);
map.put("result", errInfo);
return map;
}
private void saveAcceptImg(MultipartFile[] files,String signertime, String BREAKGROUND_ID, String CORPINFO_ID, String ACCEPT_USER_ID, String ACCEPT_DEPARTMENT_ID) throws Exception{
if (files != null && files.length > 0) {
for (int i = 0; i < files.length; i++) {
PageData cpd = new PageData();
cpd = this.getPageData();
MultipartFile file = files[i];
String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
smb.sshSftp(file, fileName,Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile);
cpd.put("ACCEPT_USER_SIGNER_TIME", signertime);
cpd.put("ACCEPT_CONFESS_ID", this.get32UUID());
cpd.put("OPERATOR", cpd.get("OPERATOR")); //修改人
cpd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
cpd.put("ACCEPT_USER_SIGNER_PATH", Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile + "/" + fileName);
cpd.put("ISDELETE", '0');
cpd.put("CORPINFO_ID", CORPINFO_ID);
cpd.put("BREAKGROUND_ID", BREAKGROUND_ID);
cpd.put("ACCEPT_USER_ID", ACCEPT_USER_ID);
cpd.put("ACCEPT_CONFESS_DEPARTMENT_ID", "");
cpd.put("ACCEPT_CONFESS_USER_ID", "");
cpd.put("ACCEPT_DEPARTMENT_ID", ACCEPT_DEPARTMENT_ID);
breakgroundacceptuserService.save(cpd);
}
}
}
/**修改
* @param
* @throws Exception
@ -443,7 +570,7 @@ public class AppGFBreakGroundController extends BaseController {
String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pd2.put("CONSTRUCTION_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
pd2.put("CONSTRUCTION_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
@ -465,7 +592,21 @@ public class AppGFBreakGroundController extends BaseController {
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
GFbreakGroundService.edit(pd2);
log.put("ACTION", "作业负责单位通过");
GFbreakGroundToMeasuresService.delete(pd);
if(pd.get("measuresList")!=null){
List<JSONObject> list = (List<JSONObject>) JSON.parse(pd.get("measuresList").toString());
for (JSONObject json : list) {
PageData measures = new PageData();
measures.put("BREAKGROUNDTOMEASURES_ID", this.get32UUID()); // 主键
measures.put("BREAKGROUND_ID", pd.get("BREAKGROUND_ID"));
measures.put("BUS_BREAKGROUND_MEASURES_ID", json.get("BUS_BREAKGROUND_MEASURES_ID"));
measures.put("STATUS", json.get("STATUS"));
measures.put("ANSWER", json.get("ANSWER"));
measures.put("CONFIRM_ID", pd.get("OPERATOR"));
measures.put("CONFIRM_NAME", pd.get("ACTION_USER"));
GFbreakGroundToMeasuresService.save(measures);
}
}
// 发短信
this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2);
}
@ -478,7 +619,7 @@ public class AppGFBreakGroundController extends BaseController {
String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pd2.put("PRODUCTION_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
pd2.put("PRODUCTION_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
@ -508,7 +649,7 @@ public class AppGFBreakGroundController extends BaseController {
String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pd2.put("SAFETY_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
pd2.put("SAFETY_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
@ -534,7 +675,7 @@ public class AppGFBreakGroundController extends BaseController {
String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pd2.put("LEADER_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
pd2.put("LEADER_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
@ -556,7 +697,7 @@ public class AppGFBreakGroundController extends BaseController {
String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pd2.put("ACCEPT_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
pd2.put("ACCEPT_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
@ -733,6 +874,8 @@ public class AppGFBreakGroundController extends BaseController {
pd = GFbreakGroundService.findById(pd); //根据ID读取
map.put("pd", pd);
map.put("measuresList", GFbreakGroundService.listAllMeasures(pd));
map.put("imgList1",breakgroundacceptuserService.findById(pd));
map.put("imgList",breakgroundacceptuserService.findByIds(pd));
map.put("result", errInfo);
return map;
}

7
src/main/java/com/zcloud/controller/gf/GFBreakGroundController.java
View File

@ -3,6 +3,7 @@ package com.zcloud.controller.gf;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.service.gf.GFBreakGroundAcceptUserService;
import com.zcloud.service.gf.GFBreakGroundService;
import com.zcloud.util.Jurisdiction;
import com.zcloud.util.ObjectExcelView;
@ -31,6 +32,8 @@ public class GFBreakGroundController extends BaseController {
@Autowired
private GFBreakGroundService GFbreakgroundService;
@Autowired
private GFBreakGroundAcceptUserService breakgroundacceptuserService;
/**新增
* @param
@ -51,7 +54,7 @@ public class GFBreakGroundController extends BaseController {
}
/**删除
* @param out
* @param
* @throws Exception
*/
@RequestMapping(value="/delete")
@ -129,6 +132,8 @@ public class GFBreakGroundController extends BaseController {
pd = GFbreakgroundService.findById(pd); //根据ID读取
map.put("pd", pd);
map.put("measuresList", GFbreakgroundService.listAllMeasures(pd));
map.put("imgList",breakgroundacceptuserService.findByIds(pd));
map.put("imgList1",breakgroundacceptuserService.findById(pd));
map.put("result", errInfo);
return map;
}

67
src/main/java/com/zcloud/mapper/datasource/gf/GFBreakGroundAcceptUserMapper.java Normal file
View File

@ -0,0 +1,67 @@
package com.zcloud.mapper.datasource.gf;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import java.util.List;
/**
* 说明：图片管理
* 作者：luoxiaobao
* 时间：2020-12-24
* 官网：www.zcloudchina.com
*/
public interface GFBreakGroundAcceptUserMapper {
/**新增
* @param pd
* @throws Exception
*/
void save(PageData pd);
/**删除
* @param pd
* @throws Exception
*/
void delete(PageData pd);
/**删除
* @param pd
* @throws Exception
*/
void deleteList(PageData pd);
/**修改
* @param pd
* @throws Exception
*/
void edit(PageData pd);
/**列表
* @param page
* @throws Exception
*/
List<PageData> datalistPage(Page page);
/**列表(全部)
* @param pd
* @throws Exception
*/
List<PageData> listAll(PageData pd);
/**通过id获取数据
* @param pd
* @throws Exception
*/
List<PageData> findById(PageData pd);
List<PageData> findByIds(PageData pd);
/**批量删除
* @param ArrayDATA_IDS
* @throws Exception
*/
void deleteAll(String[] ArrayDATA_IDS);
List<PageData> listAllByIds(PageData pd);
}

67
src/main/java/com/zcloud/service/gf/GFBreakGroundAcceptUserService.java Normal file
View File

@ -0,0 +1,67 @@
package com.zcloud.service.gf;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import java.util.List;
/**
* 说明：图片管理
* 作者：luoxiaobao
* 时间：2020-12-24
* 官网：www.zcloudchina.com
*/
public interface GFBreakGroundAcceptUserService {
/**新增
* @param pd
* @throws Exception
*/
public void save(PageData pd)throws Exception;
/**删除
* @param pd
* @throws Exception
*/
public void delete(PageData pd)throws Exception;
/**删除
* @param pd
* @throws Exception
*/
public void deleteList(PageData pd)throws Exception;
/**修改
* @param pd
* @throws Exception
*/
public void edit(PageData pd)throws Exception;
/**列表
* @param page
* @throws Exception
*/
public List<PageData> list(Page page)throws Exception;
/**列表(全部)
* @param pd
* @throws Exception
*/
public List<PageData> listAll(PageData pd)throws Exception;
/**通过id获取数据
* @param pd
* @throws Exception
*/
public List<PageData> findById(PageData pd)throws Exception;
public List<PageData> findByIds(PageData pd)throws Exception;
/**批量删除
* @param ArrayDATA_IDS
* @throws Exception
*/
public void deleteAll(String[] ArrayDATA_IDS)throws Exception;
public List<PageData> listAllByIds(PageData pd)throws Exception;
}

102
src/main/java/com/zcloud/service/gf/impl/GFBreakGroundAcceptUserServiceImpl.java Normal file
View File

@ -0,0 +1,102 @@
package com.zcloud.service.gf.impl;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.mapper.datasource.gf.GFBreakGroundAcceptUserMapper;
import com.zcloud.service.gf.GFBreakGroundAcceptUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
/**
* 说明：图片管理
* 作者：luoxiaobao
* 时间：2020-12-24
* 官网：www.zcloudchina.com
*/
@Service
@Transactional //开启事物
public class GFBreakGroundAcceptUserServiceImpl implements GFBreakGroundAcceptUserService {
@Autowired
private GFBreakGroundAcceptUserMapper breakgroundacceptuserMapper;
/**新增
* @param pd
* @throws Exception
*/
public void save(PageData pd)throws Exception{
breakgroundacceptuserMapper.save(pd);
}
/**删除
* @param pd
* @throws Exception
*/
public void delete(PageData pd)throws Exception{
breakgroundacceptuserMapper.delete(pd);
}
/**删除
* @param pd
* @throws Exception
*/
public void deleteList(PageData pd)throws Exception{
breakgroundacceptuserMapper.deleteList(pd);
}
/**修改
* @param pd
* @throws Exception
*/
public void edit(PageData pd)throws Exception{
breakgroundacceptuserMapper.edit(pd);
}
/**列表
* @param page
* @throws Exception
*/
public List<PageData> list(Page page)throws Exception{
return breakgroundacceptuserMapper.datalistPage(page);
}
/**列表(全部)
* @param pd
* @throws Exception
*/
public List<PageData> listAll(PageData pd)throws Exception{
return breakgroundacceptuserMapper.listAll(pd);
}
/**通过id获取数据
* @param pd
* @throws Exception
*/
public List<PageData> findById(PageData pd)throws Exception{
return breakgroundacceptuserMapper.findById(pd);
}
public List<PageData> findByIds(PageData pd)throws Exception{
return breakgroundacceptuserMapper.findByIds(pd);
}
/**批量删除
* @param ArrayDATA_IDS
* @throws Exception
*/
public void deleteAll(String[] ArrayDATA_IDS)throws Exception{
breakgroundacceptuserMapper.deleteAll(ArrayDATA_IDS);
}
/**列表(全部)
* @param pd
* @throws Exception
*/
public List<PageData> listAllByIds(PageData pd)throws Exception{
return breakgroundacceptuserMapper.listAllByIds(pd);
}
}

217
src/main/resources/mybatis/datasource/gf/BreakGroundAcceptUserMapper.xml Normal file
View File

@ -0,0 +1,217 @@
<?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.zcloud.mapper.datasource.gf.GFBreakGroundAcceptUserMapper">
<!--表名 -->
<sql id="tableName">
GF_BREAKGROUND_ACCEPTUSER
</sql>
<!--数据字典表名 -->
<sql id="dicTableName">
SYS_DICTIONARIES
</sql>
<sql id="Field">
f.ACCEPT_CONFESS_ID,
f.BREAKGROUND_ID,
f.CORPINFO_ID,
f.ISDELETE,
f.OPERATTIME,
f.OPERATOR,
f.ACCEPT_CONFESS_DEPARTMENT_ID,
f.ACCEPT_CONFESS_USER_ID,
f.ACCEPT_CONFESS_USER_SIGNER_PATH,
f.ACCEPT_CONFESS_USER_SIGNER_TIME,
f.ISSELF,
f.ACCEPT_USER_ID,
f.ACCEPT_USER_SIGNER_PATH,
f.ACCEPT_USER_SIGNER_TIME,
f.ACCEPT_DEPARTMENT_ID
</sql>
<!-- 字段用于新增 -->
<sql id="Field2">
ACCEPT_CONFESS_ID,
BREAKGROUND_ID,
CORPINFO_ID,
ISDELETE,
OPERATTIME,
OPERATOR,
ACCEPT_CONFESS_DEPARTMENT_ID,
ACCEPT_CONFESS_USER_ID,
ACCEPT_CONFESS_USER_SIGNER_PATH,
ACCEPT_CONFESS_USER_SIGNER_TIME,
ISSELF,
ACCEPT_USER_ID,
ACCEPT_USER_SIGNER_PATH,
ACCEPT_USER_SIGNER_TIME,
ACCEPT_DEPARTMENT_ID
</sql>
<!-- 字段值 -->
<sql id="FieldValue">
#{ACCEPT_CONFESS_ID},
#{BREAKGROUND_ID},
#{CORPINFO_ID},
#{ISDELETE},
#{OPERATTIME},
#{OPERATOR},
#{ACCEPT_CONFESS_DEPARTMENT_ID},
#{ACCEPT_CONFESS_USER_ID},
#{ACCEPT_CONFESS_USER_SIGNER_PATH},
#{ACCEPT_CONFESS_USER_SIGNER_TIME},
#{ISSELF},
#{ACCEPT_USER_ID},
#{ACCEPT_USER_SIGNER_PATH},
#{ACCEPT_USER_SIGNER_TIME},
#{ACCEPT_DEPARTMENT_ID}
</sql>
<!-- 新增-->
<insert id="save" parameterType="pd">
insert into
<include refid="tableName"></include>
(
<include refid="Field2"></include>
) values (
<include refid="FieldValue"></include>
)
</insert>
<!-- 删除-->
<delete id="delete" parameterType="pd">
delete from
<include refid="tableName"></include>
where
ACCEPT_CONFESS_ID = #{ACCEPT_CONFESS_ID}
</delete>
<!-- 修改 -->
<update id="edit" parameterType="pd">
update
<include refid="tableName"></include>
set
ACCEPT_CONFESS_ID = #{ACCEPT_CONFESS_ID},
BREAKGROUND_ID = #{BREAKGROUND_ID},
CORPINFO_ID = #{CORPINFO_ID},
OPERATTIME = #{OPERATTIME},
OPERATOR = #{OPERATOR},
ACCEPT_CONFESS_DEPARTMENT_ID = #{ACCEPT_CONFESS_DEPARTMENT_ID},
ACCEPT_CONFESS_USER_ID = #{ACCEPT_CONFESS_USER_ID},
ACCEPT_CONFESS_USER_SIGNER_PATH = #{ACCEPT_CONFESS_USER_SIGNER_PATH},
ACCEPT_CONFESS_USER_SIGNER_TIME = #{ACCEPT_CONFESS_USER_SIGNER_TIME},
ISSELF = #{ISSELF}
where
ACCEPT_CONFESS_ID = #{ACCEPT_CONFESS_ID}
</update>
<!-- 通过ID获取数据 -->
<select id="findById" parameterType="pd" resultType="pd">
select
f.ACCEPT_CONFESS_ID,
f.BREAKGROUND_ID,
f.CORPINFO_ID,
f.ISDELETE,
f.OPERATTIME,
f.OPERATOR,
f.ACCEPT_USER_ID,
f.ACCEPT_USER_SIGNER_PATH,
f.ACCEPT_USER_SIGNER_TIME,
f.ACCEPT_DEPARTMENT_ID
from
<include refid="tableName"></include> f
where
f.BREAKGROUND_ID = #{BREAKGROUND_ID} and f.CORPINFO_ID = #{CORPINFO_ID} and f.ACCEPT_USER_ID = #{ACCEPT_USER_ID}
order by f.ACCEPT_USER_SIGNER_TIME ASC
</select>
<select id="findByIds" parameterType="pd" resultType="pd">
select
f.ACCEPT_CONFESS_ID,
f.BREAKGROUND_ID,
f.CORPINFO_ID,
f.ISDELETE,
f.OPERATTIME,
f.OPERATOR,
f.ACCEPT_CONFESS_DEPARTMENT_ID,
f.ACCEPT_CONFESS_USER_ID,
f.ACCEPT_CONFESS_USER_SIGNER_PATH,
f.ACCEPT_CONFESS_USER_SIGNER_TIME
from
<include refid="tableName"></include> f
where
f.BREAKGROUND_ID = #{BREAKGROUND_ID} and f.CORPINFO_ID = #{CORPINFO_ID} and f.ACCEPT_CONFESS_USER_ID = #{ACCEPT_CONFESS_USER_ID}
order by f.ACCEPT_CONFESS_USER_SIGNER_TIME ASC
</select>
<!-- 列表 -->
<select id="datalistPage" parameterType="page" resultType="pd">
select
<include refid="Field"></include>
from
<include refid="tableName"></include> f
where f.ISDELETE = '0'
<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
and
(
<!-- 根据需求自己加检索条件
字段1 LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
or
字段2 LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
-->
)
</if>
</select>
<!-- 列表(全部) -->
<select id="listAll" parameterType="pd" resultType="pd">
select
<include refid="Field"></include>
from
<include refid="tableName"></include> f
where 1=1
<if test="ISSELF != null and ISSELF != ''"><!-- 关键词检索 -->
and
f.ISSELF=#{ISSELF}
</if>
<if test="BREAKGROUND_ID != null and BREAKGROUND_ID != ''"><!-- 关键词检索 -->
and
f.BREAKGROUND_ID=#{BREAKGROUND_ID}
</if>
</select>
<!-- 批量删除 -->
<delete id="deleteAll" parameterType="String">
update
<include refid="tableName"></include>
set
ISDELETE = '1'
where
ACCEPT_CONFESS_ID in
<foreach item="item" index="index" collection="ArrayDATA_IDS" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<!-- 列表 -->
<select id="listAllByIds" parameterType="String" resultType="pd">
select
<include refid="Field"></include>
from
<include refid="tableName"></include> f
where 1=1
<if test="ArrayDATA_IDS != null and ArrayDATA_IDS != ''"><!-- 关键词检索 -->
and f.ACCEPT_CONFESS_ID in
<foreach item="item" index="index" collection="ArrayDATA_IDS" open="(" separator="," close=")">
#{item}
</foreach>
</if>
</select>
</mapper>

286
src/main/resources/mybatis/datasource/gf/BreakGroundMapper.xml
View File

@ -332,8 +332,8 @@
f.CHECK_NO,
f.PROJECT_MANAGER,
f.WORK_CONTENT,
f.WORK_START_DATE,
f.WORK_END_DATE,
replace(f.WORK_START_DATE,'-','/') as WORK_START_DATE,
replace(f.WORK_END_DATE,'-','/') as WORK_END_DATE,
f.WORK_PLACE,
f.CONSTRUCTION_DEPARTMENT_ID,
f.CONSTRUCTION_USER_ID,
@ -366,7 +366,7 @@
f.HAZARD_IDENTIFICATION,
f.CONFESS_USER,
f.ACCEPT_CONFESS_USER,
f.SPECIAL_WORK,
IFNULL(f.SPECIAL_WORK,'无') as SPECIAL_WORK,
f.GUARDIAN_USER,
f.JOB_CONTENT,
f.APPLY_USER_SIGNER_PATH,
@ -450,7 +450,74 @@
<!-- 列表 -->
<select id="datalistPage" parameterType="page" resultType="pd">
select
<include refid="Field"></include>,
f.CORPINFO_ID,
f.APPLY_DEPARTMENT_ID,
f.APPLY_USER_ID,
f.ISDELETE,
f.CREATTIME,
f.CREATOR,
f.OPERATTIME,
f.OPERATOR,
f.CHECK_NO,
f.PROJECT_MANAGER,
f.WORK_CONTENT,
f.WORK_START_DATE,
f.WORK_END_DATE,
f.WORK_PLACE,
f.CONSTRUCTION_DEPARTMENT_ID,
f.CONSTRUCTION_USER_ID,
f.CONSTRUCTION_USER_SIGNER_PATH,
f.CONSTRUCTION_USER_SIGNER_TIME,
f.PRODUCTION_DEPARTMENT_ID,
f.PRODUCTION_USER_ID,
f.PRODUCTION_USER_SIGNER_PATH,
f.PRODUCTION_USER_SIGNER_TIME,
f.SAFETY_DEPARTMENT_ID,
f.SAFETY_USER_ID,
f.SAFETY_USER_SIGNER_PATH,
f.SAFETY_USER_SIGNER_TIME,
f.LEADER_DEPARTMENT_ID,
f.LEADER_USER_ID,
f.LEADER_USER_SIGNER_PATH,
f.LEADER_USER_SIGNER_TIME,
f.ACCEPT_DEPARTMENT_ID,
f.ACCEPT_USER_ID,
f.ACCEPT_USER_SIGNER_PATH,
f.ACCEPT_USER_SIGNER_TIME,
f.APPLY_STATUS,
f.WORK_NO,
f.CONSTRUCTION_CONTENT,
f.PRODUCTION_CONTENT,
f.SAFETY_CONTENT,
f.LEADER_CONTENT,
f.ACCEPT_CONTENT,
f.OTHER_PROTECTIVE_MEASURES,
f.HAZARD_IDENTIFICATION,
f.CONFESS_USER,
f.ACCEPT_CONFESS_USER,
f.SPECIAL_WORK,
f.GUARDIAN_USER,
f.JOB_CONTENT,
f.APPLY_USER_SIGNER_PATH,
f.APPLY_USER_SIGNER_TIME,
f.CONTENT_IMG_PATH,
f.BREAKGROUND_ID,
f.GUARDIAN_DEPARTMENT_ID,
f.GUARDIAN_USER_ID,
f.GUARDIAN_USER_SIGNER_PATH,
f.GUARDIAN_USER_SIGNER_TIME,
f.CONFESS_DEPARTMENT_ID,
f.CONFESS_USER_ID,
f.CONFESS_USER_SIGNER_PATH,
f.CONFESS_USER_SIGNER_TIME,
f.ACCEPT_CONFESS_DEPARTMENT_ID,
f.ACCEPT_CONFESS_USER_ID,
(SELECT a.ACCEPT_CONFESS_USER_SIGNER_TIME from GF_BREAKGROUND_ACCEPTUSER a where a.ISDELETE = '0'
AND a.BREAKGROUND_ID = f.BREAKGROUND_ID
ORDER BY
a.ACCEPT_CONFESS_USER_SIGNER_TIME DESC LIMIT 1) as ACCEPT_CONFESS_USER_SIGNER_TIME,
ad.NAME as APPLY_DEPARTMENT_NAME,
getFullName(ad.DEPARTMENT_ID) APPLY_DEPARTMENT_ALL,
au.NAME as APPLY_USER_NAME,
@ -600,7 +667,73 @@
</select>
<select id="aqdatalistPage" parameterType="page" resultType="pd">
select
<include refid="Field"></include>,
f.CORPINFO_ID,
f.APPLY_DEPARTMENT_ID,
f.APPLY_USER_ID,
f.ISDELETE,
f.CREATTIME,
f.CREATOR,
f.OPERATTIME,
f.OPERATOR,
f.CHECK_NO,
f.PROJECT_MANAGER,
f.WORK_CONTENT,
f.WORK_START_DATE,
f.WORK_END_DATE,
f.WORK_PLACE,
f.CONSTRUCTION_DEPARTMENT_ID,
f.CONSTRUCTION_USER_ID,
f.CONSTRUCTION_USER_SIGNER_PATH,
f.CONSTRUCTION_USER_SIGNER_TIME,
f.PRODUCTION_DEPARTMENT_ID,
f.PRODUCTION_USER_ID,
f.PRODUCTION_USER_SIGNER_PATH,
f.PRODUCTION_USER_SIGNER_TIME,
f.SAFETY_DEPARTMENT_ID,
f.SAFETY_USER_ID,
f.SAFETY_USER_SIGNER_PATH,
f.SAFETY_USER_SIGNER_TIME,
f.LEADER_DEPARTMENT_ID,
f.LEADER_USER_ID,
f.LEADER_USER_SIGNER_PATH,
f.LEADER_USER_SIGNER_TIME,
f.ACCEPT_DEPARTMENT_ID,
f.ACCEPT_USER_ID,
f.ACCEPT_USER_SIGNER_PATH,
f.ACCEPT_USER_SIGNER_TIME,
f.APPLY_STATUS,
f.WORK_NO,
f.CONSTRUCTION_CONTENT,
f.PRODUCTION_CONTENT,
f.SAFETY_CONTENT,
f.LEADER_CONTENT,
f.ACCEPT_CONTENT,
f.OTHER_PROTECTIVE_MEASURES,
f.HAZARD_IDENTIFICATION,
f.CONFESS_USER,
f.ACCEPT_CONFESS_USER,
f.SPECIAL_WORK,
f.GUARDIAN_USER,
f.JOB_CONTENT,
f.APPLY_USER_SIGNER_PATH,
f.APPLY_USER_SIGNER_TIME,
f.CONTENT_IMG_PATH,
f.BREAKGROUND_ID,
f.GUARDIAN_DEPARTMENT_ID,
f.GUARDIAN_USER_ID,
f.GUARDIAN_USER_SIGNER_PATH,
f.GUARDIAN_USER_SIGNER_TIME,
f.CONFESS_DEPARTMENT_ID,
f.CONFESS_USER_ID,
f.CONFESS_USER_SIGNER_PATH,
f.CONFESS_USER_SIGNER_TIME,
f.ACCEPT_CONFESS_DEPARTMENT_ID,
f.ACCEPT_CONFESS_USER_ID,
(SELECT a.ACCEPT_CONFESS_USER_SIGNER_TIME from GF_BREAKGROUND_ACCEPTUSER a where a.ISDELETE = '0'
AND a.BREAKGROUND_ID = f.BREAKGROUND_ID
ORDER BY
a.ACCEPT_CONFESS_USER_SIGNER_TIME DESC LIMIT 1) as ACCEPT_CONFESS_USER_SIGNER_TIME,
ad.NAME as APPLY_DEPARTMENT_NAME,
getFullName(ad.DEPARTMENT_ID) APPLY_DEPARTMENT_ALL,
au.NAME as APPLY_USER_NAME,
@ -748,7 +881,73 @@
</select>
<select id="jhdatalistPage" parameterType="page" resultType="pd">
select
<include refid="Field"></include>,
f.CORPINFO_ID,
f.APPLY_DEPARTMENT_ID,
f.APPLY_USER_ID,
f.ISDELETE,
f.CREATTIME,
f.CREATOR,
f.OPERATTIME,
f.OPERATOR,
f.CHECK_NO,
f.PROJECT_MANAGER,
f.WORK_CONTENT,
f.WORK_START_DATE,
f.WORK_END_DATE,
f.WORK_PLACE,
f.CONSTRUCTION_DEPARTMENT_ID,
f.CONSTRUCTION_USER_ID,
f.CONSTRUCTION_USER_SIGNER_PATH,
f.CONSTRUCTION_USER_SIGNER_TIME,
f.PRODUCTION_DEPARTMENT_ID,
f.PRODUCTION_USER_ID,
f.PRODUCTION_USER_SIGNER_PATH,
f.PRODUCTION_USER_SIGNER_TIME,
f.SAFETY_DEPARTMENT_ID,
f.SAFETY_USER_ID,
f.SAFETY_USER_SIGNER_PATH,
f.SAFETY_USER_SIGNER_TIME,
f.LEADER_DEPARTMENT_ID,
f.LEADER_USER_ID,
f.LEADER_USER_SIGNER_PATH,
f.LEADER_USER_SIGNER_TIME,
f.ACCEPT_DEPARTMENT_ID,
f.ACCEPT_USER_ID,
f.ACCEPT_USER_SIGNER_PATH,
f.ACCEPT_USER_SIGNER_TIME,
f.APPLY_STATUS,
f.WORK_NO,
f.CONSTRUCTION_CONTENT,
f.PRODUCTION_CONTENT,
f.SAFETY_CONTENT,
f.LEADER_CONTENT,
f.ACCEPT_CONTENT,
f.OTHER_PROTECTIVE_MEASURES,
f.HAZARD_IDENTIFICATION,
f.CONFESS_USER,
f.ACCEPT_CONFESS_USER,
f.SPECIAL_WORK,
f.GUARDIAN_USER,
f.JOB_CONTENT,
f.APPLY_USER_SIGNER_PATH,
f.APPLY_USER_SIGNER_TIME,
f.CONTENT_IMG_PATH,
f.BREAKGROUND_ID,
f.GUARDIAN_DEPARTMENT_ID,
f.GUARDIAN_USER_ID,
f.GUARDIAN_USER_SIGNER_PATH,
f.GUARDIAN_USER_SIGNER_TIME,
f.CONFESS_DEPARTMENT_ID,
f.CONFESS_USER_ID,
f.CONFESS_USER_SIGNER_PATH,
f.CONFESS_USER_SIGNER_TIME,
f.ACCEPT_CONFESS_DEPARTMENT_ID,
f.ACCEPT_CONFESS_USER_ID,
(SELECT a.ACCEPT_CONFESS_USER_SIGNER_TIME from GF_BREAKGROUND_ACCEPTUSER a where a.ISDELETE = '0'
AND a.BREAKGROUND_ID = f.BREAKGROUND_ID
ORDER BY
a.ACCEPT_CONFESS_USER_SIGNER_TIME DESC LIMIT 1) as ACCEPT_CONFESS_USER_SIGNER_TIME,
ad.NAME as APPLY_DEPARTMENT_NAME,
getFullName(ad.DEPARTMENT_ID) APPLY_DEPARTMENT_ALL,
au.NAME as APPLY_USER_NAME,
@ -896,7 +1095,73 @@
</select>
<select id="jsdatalistPage" parameterType="page" resultType="pd">
select
<include refid="Field"></include>,
f.CORPINFO_ID,
f.APPLY_DEPARTMENT_ID,
f.APPLY_USER_ID,
f.ISDELETE,
f.CREATTIME,
f.CREATOR,
f.OPERATTIME,
f.OPERATOR,
f.CHECK_NO,
f.PROJECT_MANAGER,
f.WORK_CONTENT,
f.WORK_START_DATE,
f.WORK_END_DATE,
f.WORK_PLACE,
f.CONSTRUCTION_DEPARTMENT_ID,
f.CONSTRUCTION_USER_ID,
f.CONSTRUCTION_USER_SIGNER_PATH,
f.CONSTRUCTION_USER_SIGNER_TIME,
f.PRODUCTION_DEPARTMENT_ID,
f.PRODUCTION_USER_ID,
f.PRODUCTION_USER_SIGNER_PATH,
f.PRODUCTION_USER_SIGNER_TIME,
f.SAFETY_DEPARTMENT_ID,
f.SAFETY_USER_ID,
f.SAFETY_USER_SIGNER_PATH,
f.SAFETY_USER_SIGNER_TIME,
f.LEADER_DEPARTMENT_ID,
f.LEADER_USER_ID,
f.LEADER_USER_SIGNER_PATH,
f.LEADER_USER_SIGNER_TIME,
f.ACCEPT_DEPARTMENT_ID,
f.ACCEPT_USER_ID,
f.ACCEPT_USER_SIGNER_PATH,
f.ACCEPT_USER_SIGNER_TIME,
f.APPLY_STATUS,
f.WORK_NO,
f.CONSTRUCTION_CONTENT,
f.PRODUCTION_CONTENT,
f.SAFETY_CONTENT,
f.LEADER_CONTENT,
f.ACCEPT_CONTENT,
f.OTHER_PROTECTIVE_MEASURES,
f.HAZARD_IDENTIFICATION,
f.CONFESS_USER,
f.ACCEPT_CONFESS_USER,
f.SPECIAL_WORK,
f.GUARDIAN_USER,
f.JOB_CONTENT,
f.APPLY_USER_SIGNER_PATH,
f.APPLY_USER_SIGNER_TIME,
f.CONTENT_IMG_PATH,
f.BREAKGROUND_ID,
f.GUARDIAN_DEPARTMENT_ID,
f.GUARDIAN_USER_ID,
f.GUARDIAN_USER_SIGNER_PATH,
f.GUARDIAN_USER_SIGNER_TIME,
f.CONFESS_DEPARTMENT_ID,
f.CONFESS_USER_ID,
f.CONFESS_USER_SIGNER_PATH,
f.CONFESS_USER_SIGNER_TIME,
f.ACCEPT_CONFESS_DEPARTMENT_ID,
f.ACCEPT_CONFESS_USER_ID,
(SELECT a.ACCEPT_CONFESS_USER_SIGNER_TIME from GF_BREAKGROUND_ACCEPTUSER a where a.ISDELETE = '0'
AND a.BREAKGROUND_ID = f.BREAKGROUND_ID
ORDER BY
a.ACCEPT_CONFESS_USER_SIGNER_TIME DESC LIMIT 1) as ACCEPT_CONFESS_USER_SIGNER_TIME,
ad.NAME as APPLY_DEPARTMENT_NAME,
getFullName(ad.DEPARTMENT_ID) APPLY_DEPARTMENT_ALL,
au.NAME as APPLY_USER_NAME,
@ -953,7 +1218,10 @@
left join OA_DEPARTMENT acd on acd.DEPARTMENT_ID = f.ACCEPT_DEPARTMENT_ID
left join SYS_USER acu on acu.USER_ID = f.ACCEPT_USER_ID
where f.ISDELETE = '0'
and f.APPLY_STATUS &lt; 6 and f.ACCEPT_CONFESS_USER_SIGNER_TIME is null and f.APPLY_STATUS &gt; 0
and f.APPLY_STATUS &lt; 6
and not exists(select 1 from GF_BREAKGROUND_ACCEPTUSER m where m.BREAKGROUND_ID = f.BREAKGROUND_ID and m.CORPINFO_ID = f.CORPINFO_ID and f.ACCEPT_CONFESS_USER_ID = m.ACCEPT_CONFESS_USER_ID)
and f.APPLY_STATUS &gt; 0
<if test="pd.CORPINFO_ID != null and pd.CORPINFO_ID != ''">
and f.CORPINFO_ID = #{pd.CORPINFO_ID}
@ -1093,7 +1361,7 @@
COUNT(CASE WHEN f.APPLY_STATUS = '5' AND f.ACCEPT_USER_ID = #{USER_ID} THEN f.BREAKGROUND_ID END) COUNTACCEPT,
COUNT(CASE WHEN f.APPLY_STATUS &lt; '6' AND f.APPLY_STATUS &gt; 0 AND f.GUARDIAN_USER_ID = #{USER_ID} and f.GUARDIAN_USER_SIGNER_TIME is null THEN f.BREAKGROUND_ID END) COUNTGUARDIAN,
COUNT(CASE WHEN f.APPLY_STATUS &lt; '6' AND f.APPLY_STATUS &gt; 0 AND f.CONFESS_USER_ID = #{USER_ID} and f.CONFESS_USER_SIGNER_TIME is null THEN f.BREAKGROUND_ID END) COUNTCONFESS,
COUNT(CASE WHEN f.APPLY_STATUS &lt; '6' AND f.APPLY_STATUS &gt; 0 AND f.ACCEPT_CONFESS_USER_ID = #{USER_ID} and f.ACCEPT_CONFESS_USER_SIGNER_TIME is null THEN f.BREAKGROUND_ID END) COUNTACCEPTCONFESS
COUNT(CASE WHEN f.APPLY_STATUS &lt; '6' AND f.APPLY_STATUS &gt; 0 AND f.ACCEPT_CONFESS_USER_ID = #{USER_ID} and not exists(select 1 from GF_BREAKGROUND_ACCEPTUSER m where m.BREAKGROUND_ID = f.BREAKGROUND_ID and m.CORPINFO_ID = f.CORPINFO_ID and f.ACCEPT_CONFESS_USER_ID = m.ACCEPT_CONFESS_USER_ID) THEN f.BREAKGROUND_ID END) COUNTACCEPTCONFESS
FROM <include refid="tableName"></include> f
WHERE f.ISDELETE = '0' AND f.CORPINFO_ID = #{CORPINFO_ID}
</select>