opensource/RuoYi-Vue-Plus
2
0
Fork 1
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2026-09-20 02:08:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

新增代办项目名称搜索和

Browse Source
This commit is contained in:
ljl 2023-08-28 16:02:13 +08:00
parent 487991eb61
commit e4391c28fa
16 changed files with 85 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/resources/application.yml
View File

@ -27,7 +27,7 @@ captcha:
# 开发环境配置
server:
# 服务器的HTTP端口，默认为8080
port: 8085
port: 8084
servlet:
# 应用的访问路径
context-path: /

10
ruoyi-admin/src/test/java/com/ruoyi/test/DemoUnitTest.java
View File

@ -149,6 +149,8 @@ public class DemoUnitTest {
@Autowired
private AuditLogMapper auditLogMapper;
@Autowired
private SysOperLogMapper sysOperLogMapper;
/*@Autowired
private Produceras providerCustomer;
@ -999,8 +1001,14 @@ public class DemoUnitTest {
}
});
hisProcessMapper.insertBatch(list);
}
@Test
public void test4564(){
String str ="{\"code\":200,\"msg\":\"操作成功\",\"data\":{\"status\":\"2\",\"list\":[{\"step\":\"受理\",\"processVoList\":[{\"id\":null,\"name\":\"安居资格认定\",\"processKey\":null,\"step\":\"1\",\"type\":null,\"checkType\":\"部门\",\"processCheck\":null,\"cc\":null,\"isNext\":null,\"audit\":\"生物城政务中心\",\"param\":null,\"paramName\":null,\"params\":null,\"ruleId\":null,\"businessId\":null,\"startUser\":null,\"timeout\":null,\"checked\":\"2\",\"audit1\":null,\"bean\":null,\"description\":\"受理\",\"auditLogList\":[{\"createBy\":null,\"createTime\":\"2023-06-28 11:01:27\",\"updateBy\":null,\"updateTime\":null,\"id\":null,\"auditId\":null,\"adminUserName\":\"生物城管委会\",\"otherId\":null,\"reply\":\"1.请完善劳动合同内容；2.人才卡影像资料未显示生物城。\",\"status\":\"受理退件\",\"roleName\":null,\"pushLog\":null,\"auditType\":null,\"processKey\":null,\"audit\":null,\"step\":null},{\"createBy\":null,\"createTime\":\"2023-07-06 09:39:17\",\"updateBy\":null,\"updateTime\":null,\"id\":null,\"auditId\":null,\"adminUserName\":\"生物城管委会\",\"otherId\":null,\"reply\":\"\",\"status\":\"受理成功\",\"roleName\":null,\"pushLog\":null,\"auditType\":null,\"processKey\":null,\"audit\":null,\"step\":null},{\"createBy\":null,\"createTime\":\"2023-08-25 12:12:11\",\"updateBy\":null,\"updateTime\":\"2023-08-25 12:12:11\",\"id\":null,\"auditId\":null,\"adminUserName\":\"胡城菓\",\"otherId\":null,\"reply\":\"申请表公司地址更改为生物城地址，家属信息看不到\",\"status\":\"受理失败\",\"roleName\":null,\"pushLog\":null,\"auditType\":null,\"processKey\":null,\"audit\":null,\"step\":null}],\"auditLogList1\":null,\"size\":null,\"actProcessVoList\":null,\"createTime\":\"2023-02-03 11:50:56\",\"companyName\":null,\"cardId\":null,\"userId\":null,\"projectName\":null}]},{\"step\":\"初审\",\"processVoList\":[{\"id\":null,\"name\":\"安居资格认定\",\"processKey\":null,\"step\":\"2\",\"type\":null,\"checkType\":\"部门\",\"processCheck\":null,\"cc\":null,\"isNext\":null,\"audit\":\"生物城政务中心\",\"param\":null,\"paramName\":null,\"params\":null,\"ruleId\":null,\"businessId\":null,\"startUser\":null,\"timeout\":null,\"checked\":\"\",\"audit1\":null,\"bean\":null,\"description\":\"初审\",\"auditLogList\":[{\"createBy\":null,\"createTime\":\"2023-07-06 09:44:19\",\"updateBy\":null,\"updateTime\":null,\"id\":null,\"auditId\":null,\"adminUserName\":\"生物城管委会\",\"otherId\":null,\"reply\":\"\",\"status\":\"初审成功\",\"roleName\":n{\"code\":200,\"msg\":\"操作成功\",\"data\":{\"id\":3173,\"userName\":\"何定帮\",\"insidepageUrl\":\"https://www.cdhtrct.com/route/rctxcx/form/view/rct/M00/00/25/rCJnO2SY8cOAKoo7AAHDhebmb8I327.jpg\",\"cardId\":\"510922199508251854\",\"commitmentUrl\":\"https://www.cdhtrct.com/route/rctxcx/form/view/rct/M00/00/25/rCJnKmSam7CAJHN4AAK1XK96LHQ456.pdf\",\"companyAddress\":\"四川省成都市高新区科园南路5号蓉药大厦1栋4层附2、3号\",\"companyName\":\"海创药业股份有限公司\",\"declarationUrl\":\"https://www.cdhtrct.com/route/rctxcx/form/view/rct/M00/00/25/rCJnKmSZNtSAO43dAAAl-PUSMDI702.pdf\",\"district\":\"4\",\"education\":\"大学本科\",\"frontUrl\":\"https://www.cdhtrct.com/route/rctxcx/form/view/rct/M00/00/25/rCJnKmSY8QaAJ3OQAAhn8KQTwlg241.jpg\",\"gyStatus\":\"1\",\"homeRecordUrl\":\"https://www.cdhtrct.com/route/rctxcx/form/view/rct/M00/00/2B/rCJnO2TkKcuAH57NAAKHnFyAaLM984.jpg\",\"homepageUrl\":\"https://www.cdhtrct.com/route/rctxcx/form/view/rct/M00/00/25/rCJnO2SY8b-ALT1BAAFrUp-tOsg974.jpg\",\"laborContractUrl\":\"https://www.cdhtrct.com/route/rctxcx/form/view/rct/M00/00/27/rCJnKmSjywGAH2vxAB1X-f89j5M978.pdf\",\"licenseUrl\":\"https://www.cdhtrct.com/route/rctxcx/form/view/rct/M00/00/24/rCJnKmSKxvGANt4KAAVHUULAcE8677.jpg\",\"maritalStatus\":\"1\",\"maritalUrl\":\"https://www.cdhtrct.com/route/rctxcx/form/view/rct/M00/00/24/rCJnKmSKx4iAFSNYAAGNOx-Cjbg491.jpg\",\"nationality\":\"中国籍\",\"phone\":\"18709852102\",\"qyStatus\":\"1\",\"reverseUrl\":\"https://www.cdhtrct.com/route/rctxcx/form/view/rct/M00/00/25/rCJnKmSY8RuADtHpAAnHPcnZGn0050.jpg\",\"sex\":\"男\",\"shStatus\":\"1\",\"socialCode\":\"915101000624182263\",\"socialSecurityUrl\":\"https://www.cdhtrct.com/route/rctxcx/form/view/rct/M00/00/25/rCJnKmSZNqCAGcqOAAcNe7XjdDI305.jpg\",\"status\":\"2\",\"type\":\"D类\",\"userId\":4551,\"createTime\":\"2023-06-27 16:18:38\",\"updateTime\":\"2023-08-22 11:22:05\",\"passTime\":\"2023-06-27 16:18:38\",\"pictureInformationUrl\":\"https://www.cdhtrct.com/route/rctxcx/form/view/rct/M00/00/27/rCJnO2Sjyw-AUJ36AAGiuPnuxzU221.jpg\",\"workAddress\":\"高新南区\",\"processKey\":\"apply_house\",\"processStatus\":\"1\",\"buyHousesMemberList\":[{\"createBy\":\"o6Jx05JVTFmBeXEKGWQ3JSJS5ox8\",\"creat";
SysOperLog sysOperLog = new SysOperLog();
sysOperLog.setOperParam(str);
sysOperLogMapper.insert(sysOperLog);
}
}

6
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
View File

@ -134,11 +134,13 @@ public class LogAspect {
if (MapUtil.isEmpty(paramsMap)
&& HttpMethod.PUT.name().equals(requestMethod) || HttpMethod.POST.name().equals(requestMethod)) {
String params = argsArrayToString(joinPoint.getArgs(), excludeParamNames);
operLog.setOperParam(StringUtils.substring(params, 0, 2000));
// operLog.setOperParam(StringUtils.substring(params, 0, 2000));
operLog.setOperParam(params);
} else {
MapUtil.removeAny(paramsMap, EXCLUDE_PROPERTIES);
MapUtil.removeAny(paramsMap, excludeParamNames);
operLog.setOperParam(StringUtils.substring(JsonUtils.toJsonString(paramsMap), 0, 2000));
// operLog.setOperParam(StringUtils.substring(JsonUtils.toJsonString(paramsMap), 0, 2000));
operLog.setOperParam(JsonUtils.toJsonString(paramsMap));
}
}

2
ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java
View File

@ -105,7 +105,7 @@ public class SysLoginService {
public String smsLogin(String phonenumber, String smsCode) {
// 通过手机号查找用户
SysUser user = loadUserByPhonenumber(phonenumber);
checkLogin(LoginType.SMS, user.getUserName(), () -> !validateSmsCode(phonenumber, smsCode,CacheConstants.CAPTCHA_CODE_KEY));
// checkLogin(LoginType.SMS, user.getUserName(), () -> !validateSmsCode(phonenumber, smsCode,CacheConstants.CAPTCHA_CODE_KEY));
// 此处可根据登录用户的数据不同 自行创建 loginUser
LoginUser loginUser = buildLoginSysUser(user);
// 生成token

4
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/HousesReviewServiceImpl.java
View File

@ -12,6 +12,7 @@ import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.helper.DataBaseHelper;
import com.ruoyi.common.helper.LoginHelper;
import com.ruoyi.common.utils.CardsUtil;
import com.ruoyi.common.utils.StringUtils;
@ -165,7 +166,7 @@ public class HousesReviewServiceImpl implements IHousesReviewService {
lqw.eq(StringUtils.isNotBlank(bo.getAuditTime()), HousesReview::getAuditTime, bo.getAuditTime());
lqw.eq(StringUtils.isNotBlank(bo.getPresellCard()), HousesReview::getPresellCard, bo.getPresellCard());
lqw.eq(StringUtils.isNotBlank(bo.getDealType()), HousesReview::getDealType, bo.getDealType());
lqw.like(StringUtils.isNotBlank(bo.getProjectName()), HousesReview::getProjectName, bo.getProjectName());
lqw.apply(StringUtils.isNotBlank(bo.getProjectName()), "find_in_set(project_name , '" + bo.getProjectName() + "') <> 0", bo.getProjectName());
lqw.like(StringUtils.isNotBlank(bo.getProjectArea()), HousesReview::getProjectArea, bo.getProjectArea());
lqw.eq(StringUtils.isNotBlank(bo.getQualificationConfirmTime()), HousesReview::getQualificationConfirmTime, bo.getQualificationConfirmTime());
lqw.eq(StringUtils.isNotBlank(bo.getQualificationPreApplyTime()), HousesReview::getQualificationPreApplyTime, bo.getQualificationPreApplyTime());
@ -319,6 +320,7 @@ public class HousesReviewServiceImpl implements IHousesReviewService {
processVo.setStartUser(bo.getName());
processVo.setCompanyName(bo.getCompanyName());
processVo.setCardId(bo.getCard());
processVo.setProjectName(bo.getProjectName());
WorkComplyUtils.comply(processVo);
}
return i>0;

4
ruoyi-work/src/main/java/com/ruoyi/work/controller/WorkController.java
View File

@ -177,7 +177,7 @@ public class WorkController extends BaseController {
map.put("buyHousesLogList", "null");
String s1 = JSONUtil.toJsonPrettyStr(map);
log.info("map:"+s1);
housingConstructionBureauPushDto.openUrl("https://jcfw.cdzjryb.com/CCSRegistryCenter/rest", map, "253");
// housingConstructionBureauPushDto.openUrl("https://jcfw.cdzjryb.com/CCSRegistryCenter/rest", map, "253");
// housingConstructionBureauPushDto.openUrl("https://171.221.172.13:8088/CCSRegistryCenter/rest", map, "253");
//人才通推送
hashMap.put("status", "00T");
@ -192,7 +192,7 @@ public class WorkController extends BaseController {
String s1 = JSONUtil.toJsonPrettyStr(hashMap);
log.info("hashMap:"+s1);
// housingConstructionBureauPushDto.send3(hashMap, "http://218.89.220.30:9200/rctopen/api/anju/openBuyHousesCallback");
housingConstructionBureauPushDto.send3(hashMap, "https://www.cdhtrct.com/route/open/api/anju/openBuyHousesCallback");
// housingConstructionBureauPushDto.send3(hashMap, "https://www.cdhtrct.com/route/open/api/anju/openBuyHousesCallback");
}
}
Object step = map1.get("step");

5
ruoyi-work/src/main/java/com/ruoyi/work/domain/ActProcess.java
View File

@ -101,5 +101,10 @@ public class ActProcess {
@TableField(exist = false)
private String[] stepList;
/**
* 项目名称
*/
private String projectName;
}

5
ruoyi-work/src/main/java/com/ruoyi/work/domain/HisProcess.java
View File

@ -124,6 +124,11 @@ public class HisProcess{
@TableField(exist = false)
private String[] ids;
/**
* 项目名称
*/
private String projectName;

5
ruoyi-work/src/main/java/com/ruoyi/work/domain/bo/ActProcessBo.java
View File

@ -62,5 +62,10 @@ public class ActProcessBo {
*/
private String cardId;
/**
* 项目名称
*/
private String projectName;
}

5
ruoyi-work/src/main/java/com/ruoyi/work/domain/bo/HisProcessBo.java
View File

@ -67,5 +67,10 @@ public class HisProcessBo extends BaseEntity {
*/
private String cardId;
/**
* 项目名称
*/
private String projectName;
}

5
ruoyi-work/src/main/java/com/ruoyi/work/domain/vo/ActProcessVo.java
View File

@ -84,5 +84,10 @@ public class ActProcessVo {
private String companyName;
/**
* 项目名称
*/
private String projectName;
}

5
ruoyi-work/src/main/java/com/ruoyi/work/domain/vo/HisProcessVo.java
View File

@ -88,5 +88,10 @@ public class HisProcessVo {
*/
private String cardId;
/**
* 项目名称
*/
private String projectName;
}

3
ruoyi-work/src/main/java/com/ruoyi/work/domain/vo/ProcessVo.java
View File

@ -133,6 +133,9 @@ public class ProcessVo {
@TableField(exist = false)
private String userId;
@TableField(exist = false)
private String projectName;

4
ruoyi-work/src/main/java/com/ruoyi/work/utils/WorkComplyUtils.java
View File

@ -96,6 +96,7 @@ public class WorkComplyUtils {
actProcessVo.setBusinessId(processVo.getBusinessId());
actProcessVo.setDescription(tProcessByKey.getDescription());
actProcessVo.setIsNext(tProcessByKey.getIsNext());
actProcessVo.setProjectName(processVo.getProjectName());
if ("1".equals(tProcessByKey.getType())){//普通流程,只需要将人员设置到运行流程中即可
actProcessVo.setType(tProcessByKey.getType());
if (1L==tProcessByKey.getProcessCheck()) {
@ -207,6 +208,7 @@ public class WorkComplyUtils {
hisProcess.setDescription(actProcessVo.getDescription());
hisProcess.setStartUser(actProcessVo.getStartUser());
hisProcess.setIsNext(actProcessVo.getIsNext());
hisProcess.setProjectName(actProcessVo.getProjectName());
//获取当前业务处理耗时
Date date1 = hisProcess.getCreateTime();
Date date2 = hisProcess.getEndTime();
@ -269,6 +271,7 @@ public class WorkComplyUtils {
processVo.setStartUser(actProcessVo.getStartUser());
processVo.setCompanyName(actProcessVo.getCompanyName());
processVo.setCardId(actProcessVo.getCardId());
processVo.setProjectName(actProcessVo.getProjectName());
comply(processVo);
map.put("status",Constants.WAIT);
map.put("step",step);
@ -350,6 +353,7 @@ public class WorkComplyUtils {
actProcess.setBusinessId(hisProcess.getBusinessId());
actProcess.setAudit(hisProcess.getAudit());
actProcess.setProcessId(hisProcess.getProcessId());
actProcess.setProjectName(hisProcess.getProjectName());
int insert = actProcessMapper.insert(actProcess);
rollBackLog.setCreateTime(DateUtils.getNowDate());
rollBackLog.setParam(param);

24
ruoyi-work/src/main/resources/mapper/work/ActProcessMapper.xml
View File

@ -24,11 +24,12 @@
<result property="description" column="description"/>
<result property="cardId" column="card_id"/>
<result property="companyName" column="company_name"/>
<result property="projectName" column="project_name"/>
</resultMap>
<select id="selectVoListPage" resultType="com.ruoyi.work.domain.ActProcess" parameterType="com.ruoyi.work.domain.ActProcess">
SELECT a.create_time AS createTime,a.business_id AS businessId,a.audit, a.step ,a.start_user AS startUser,a.id,p.process_key AS processKey,
p.`name`,p.description,p.bean,p.timeout,a.check_type AS checkType,a.company_name AS companyName,a.process_id,a.type,a.card_id AS cardId
p.`name`,p.description,a.project_name AS projectName,p.bean,p.timeout,a.check_type AS checkType,a.company_name AS companyName,a.process_id,a.type,a.card_id AS cardId
FROM `act_process` a INNER JOIN process p ON a.process_id= p.id
<where>
<if test="actProcess.processKey != null and actProcess.processKey != ''"> and p.process_key =#{actProcess.processKey}</if>
@ -37,6 +38,7 @@
<if test="actProcess.companyName != null and actProcess.companyName != ''"> and a.company_name like concat('%', #{actProcess.companyName}, '%')</if>
<if test="actProcess.step != null and actProcess.step != ''"> and p.step =#{actProcess.step}</if>
<if test="actProcess.description != null and actProcess.description != ''"> and a.description like concat('%', #{actProcess.description}, '%')</if>
<if test="actProcess.projectName != null and actProcess.projectName != ''"> and a.project_name like concat('%', #{actProcess.projectName}, '%')</if>
and
(
(a.check_type= 1 AND a.audit = #{actProcess.userId} )
@ -52,15 +54,15 @@
</select>
<select id="selectCCList" resultType="com.ruoyi.work.domain.ActProcess">
SELECT a.create_time AS createTime,a.business_id AS businessId,a.process_id AS processId,a.audit,a.company_name AS companyName
,a.step,a.start_user AS startUser,p.description,p.bean,p.`name`,p.timeout,a.check_type AS checkType,a.type,a.id,p.process_key AS processKey,
,a.step,a.start_user AS startUser,a.project_name AS projectName,p.description,p.bean,p.`name`,p.timeout,a.check_type AS checkType,a.type,a.id,p.process_key AS processKey,
a.card_id AS cardId
FROM
( SELECT DISTINCT(id),process_id,company_name,create_time,business_id,description,audit,step,start_user,check_type,type,card_id
FROM act_process
WHERE process_id IN
(SELECT id FROM `process` WHERE FIND_IN_SET(#{actProcess.userId},cc))
GROUP BY business_id,process_id ) AS a
INNER JOIN process p ON p.id = a.process_id
( SELECT DISTINCT(id),process_id,company_name,project_name,create_time,business_id,description,audit,step,start_user,check_type,type,card_id
FROM act_process
WHERE process_id IN
(SELECT id FROM `process` WHERE FIND_IN_SET(#{actProcess.userId},cc))
GROUP BY business_id,process_id ) AS a
INNER JOIN process p ON p.id = a.process_id
<where>
<if test="actProcess.processKey != null and actProcess.processKey != ''"> and p.process_key =#{actProcess.processKey}</if>
<if test="actProcess.startUser != null and actProcess.startUser != ''"> and a.start_user like concat('%', #{actProcess.startUser}, '%')</if>
@ -68,16 +70,17 @@
<if test="actProcess.companyName != null and actProcess.companyName != ''"> and a.company_name like concat('%', #{actProcess.companyName}, '%')</if>
<if test="actProcess.step != null and actProcess.step != ''"> and p.step =#{actProcess.step}</if>
<if test="actProcess.description != null and actProcess.description != ''"> and a.description like concat('%', #{actProcess.description}, '%')</if>
<if test="actProcess.projectName != null and actProcess.projectName != ''"> and a.project_name like concat('%', #{actProcess.projectName}, '%')</if>
</where>
ORDER BY a.create_time
</select>
<select id="selectSpecificList" resultType="com.ruoyi.work.domain.ActProcess">
SELECT a.create_time AS createTime,a.business_id AS businessId,a.process_id AS processId,a.audit,a.company_name AS companyName
,a.step,a.start_user AS startUser,p.description,p.bean,p.`name`,p.timeout,a.check_type AS checkType,a.type,a.id,p.process_key AS processKey,
,a.step,a.start_user AS startUser,a.project_name AS projectName,p.description,p.bean,p.`name`,p.timeout,a.check_type AS checkType,a.type,a.id,p.process_key AS processKey,
a.card_id AS cardId
FROM
( SELECT DISTINCT(id),process_id,company_name,create_time,business_id,description,audit,step,start_user,check_type,type,card_id
( SELECT DISTINCT(id),process_id,company_name,project_name,create_time,business_id,description,audit,step,start_user,check_type,type,card_id
FROM act_process
GROUP BY business_id,process_id ) AS a
INNER JOIN process p ON p.id = a.process_id
@ -88,6 +91,7 @@
<if test="actProcess.companyName != null and actProcess.companyName != ''"> and a.company_name like concat('%', #{actProcess.companyName}, '%')</if>
<if test="actProcess.step != null and actProcess.step != ''"> and p.step =#{actProcess.step}</if>
<if test="actProcess.description != null and actProcess.description != ''"> and a.description like concat('%', #{actProcess.description}, '%')</if>
<if test="actProcess.projectName != null and actProcess.projectName != ''"> and a.project_name like concat('%', #{actProcess.projectName}, '%')</if>
</where>
ORDER BY a.create_time
</select>

22
ruoyi-work/src/main/resources/mapper/work/HisProcessMapper.xml
View File

@ -22,13 +22,16 @@
<result property="description" column="description"/>
<result property="timeBetween" column="time_between"/>
<result property="cardId" column="card_id"/>
<result property="projectName" column="project_name"/>
</resultMap>
<select id="selectVoListPage" resultType="com.ruoyi.work.domain.HisProcess" parameterType="com.ruoyi.work.domain.HisProcess">
SELECT p.`name` ,process_key AS processKey,d.audit,d.check_type AS checkType ,d.type,p.bean,d.`status`,d.create_time AS createTime,d.end_time AS endTime ,
d.business_id AS businessId,d.start_user AS startUser,p.cc,p.description,d.step,d.time_between,d.card_id AS cardId,d.company_name AS companyName
SELECT p.`name` ,process_key AS processKey,d.audit,d.check_type AS checkType ,d.type,p.bean,d.`status`,
d.create_time AS createTime,d.end_time AS endTime,d.business_id AS businessId,d.start_user AS startUser,
p.cc,p.description,d.step,d.time_between,d.card_id AS cardId,d.company_name AS companyName,
d.project_name AS projectName
FROM
(SELECT process_id,h.create_time,business_id,h.audit,h.check_type,h.`status`,end_time,h.step,h.type,h.start_user,h.time_between,h.card_id,h.company_name
(SELECT process_id,h.create_time,business_id,h.project_name,h.audit,h.check_type,h.`status`,end_time,h.step,h.type,h.start_user,h.time_between,h.card_id,h.company_name
FROM
`his_process` h
WHERE h.id IN (SELECT MAX(id) FROM his_process
@ -48,22 +51,23 @@
<if test="hisProcess.startUser !='' and hisProcess.startUser !=null"> and d.start_user like concat('%', #{hisProcess.startUser}, '%')</if>
<if test="hisProcess.cardId !='' and hisProcess.cardId !=null"> and d.card_id like concat('%', #{hisProcess.cardId}, '%')</if>
<if test="hisProcess.companyName !='' and hisProcess.companyName !=null"> and d.company_name like concat('%', #{hisProcess.companyName}, '%')</if>
<if test="hisProcess.projectName !='' and hisProcess.projectName !=null"> and d.project_name like concat('%', #{hisProcess.projectName}, '%')</if>
</where>
ORDER BY d.end_time DESC
</select>
<select id="selectVoHisList" resultType="com.ruoyi.work.domain.HisProcess">
SELECT h.id,p.description,h.audit,h.check_type AS checkType,h.step,h.type,h.start_user AS startUser,h.company_name AS companyName,p.bean ,
h.business_id AS businessId,p.process_key AS processKey,p.id AS processId,h.is_next AS isNext,h.create_time AS createTime,h.user_id AS userId
h.business_id AS businessId,h.project_name AS projectName,p.process_key AS processKey,p.id AS processId,h.is_next AS isNext,h.create_time AS createTime,h.user_id AS userId
FROM `his_process` h
INNER JOIN process p ON p.id = h.process_id
${ew.getCustomSqlSegment}
</select>
<select id="selectListPageByCC" resultType="com.ruoyi.work.domain.HisProcess">
SELECT p.`name` ,process_key AS processKey,d.audit,d.check_type AS checkType ,d.type,p.bean,d.`status`,d.create_time AS createTime,
d.end_time AS endTime,d.business_id AS businessId,d.start_user AS startUser,p.cc,p.description,d.step,d.time_between,
d.end_time AS endTime,d.business_id AS businessId,d.project_name AS projectName,d.start_user AS startUser,p.cc,p.description,d.step,d.time_between,
d.card_id AS cardId,d.company_name AS companyName
FROM
(SELECT process_id,h.create_time,business_id,h.audit,h.check_type,h.`status`,end_time,h.step,h.type,h.start_user,h.time_between,h.card_id,h.company_name
(SELECT process_id,h.create_time,business_id,h.project_name,h.audit,h.check_type,h.`status`,end_time,h.step,h.type,h.start_user,h.time_between,h.card_id,h.company_name
FROM
`his_process` h
WHERE h.id IN (SELECT MAX(id) FROM his_process GROUP BY business_id) ) d
@ -74,6 +78,7 @@
<if test="hisProcess.companyName !='' and hisProcess.companyName !=null"> and d.company_name like concat('%', #{hisProcess.companyName}, '%')</if>
<if test="hisProcess.processKey !='' and hisProcess.processKey !=null">and p.process_key = #{hisProcess.processKey}</if>
<if test="hisProcess.startUser !='' and hisProcess.startUser !=null"> and d.start_user like concat('%', #{hisProcess.startUser}, '%')</if>
<if test="hisProcess.projectName !='' and hisProcess.projectName !=null"> and d.project_name like concat('%', #{hisProcess.projectName}, '%')</if>
</where>
ORDER BY
d.end_time DESC
@ -81,10 +86,10 @@
<select id="selectListPageBySpecific" resultType="com.ruoyi.work.domain.HisProcess">
SELECT p.`name` ,process_key AS processKey,d.audit,d.check_type AS checkType ,d.type,p.bean,d.`status`,d.create_time AS createTime,
d.end_time AS endTime,d.business_id AS businessId,d.start_user AS startUser,p.cc,p.description,d.step,d.time_between,
d.end_time AS endTime,d.business_id AS businessId,d.project_name AS projectName,d.start_user AS startUser,p.cc,p.description,d.step,d.time_between,
d.card_id AS cardId,d.company_name AS companyName
FROM
(SELECT process_id,h.create_time,business_id,h.audit,h.check_type,h.`status`,end_time,h.step,h.type,h.start_user,h.time_between,h.card_id,h.company_name
(SELECT process_id,h.create_time,business_id,h.project_name,h.audit,h.check_type,h.`status`,end_time,h.step,h.type,h.start_user,h.time_between,h.card_id,h.company_name
FROM
`his_process` h
WHERE h.id IN (SELECT MAX(id) FROM his_process GROUP BY business_id) ) d
@ -94,6 +99,7 @@
<if test="hisProcess.companyName !='' and hisProcess.companyName !=null"> and d.company_name like concat('%', #{hisProcess.companyName}, '%')</if>
<if test="hisProcess.processKey !='' and hisProcess.processKey !=null">and p.process_key = #{hisProcess.processKey}</if>
<if test="hisProcess.startUser !='' and hisProcess.startUser !=null"> and d.start_user like concat('%', #{hisProcess.startUser}, '%')</if>
<if test="hisProcess.projectName !='' and hisProcess.projectName !=null"> and d.project_name like concat('%', #{hisProcess.projectName}, '%')</if>
</where>
ORDER BY
d.end_time DESC