Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
6841fa12eb
|
|
@ -122,6 +122,12 @@ public class BmAgreementInfo extends BaseEntity
|
|||
@ApiModelProperty(value = "关键词")
|
||||
private String keyWord;
|
||||
|
||||
@ApiModelProperty(value = "开始时间")
|
||||
private String startTime;
|
||||
|
||||
@ApiModelProperty(value = "结束时间")
|
||||
private String endTime;
|
||||
|
||||
@ApiModelProperty(value = "附件列表")
|
||||
private List<BmFileInfo> bmFileInfos;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -114,6 +114,7 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService {
|
|||
tmTaskAgreement.setCreateBy(SecurityUtils.getUsername());
|
||||
tmTaskAgreementMapper.insertTmTaskAgreement(tmTaskAgreement);
|
||||
tmTaskRequestVo.getLeaseApplyInfo().setTaskId(tmTask.getTaskId());
|
||||
tmTaskRequestVo.getLeaseApplyInfo().setCode(taskCode);
|
||||
int count = leaseApplyInfoMapper.insertLeaseApplyInfo(tmTaskRequestVo.getLeaseApplyInfo());
|
||||
if (count > 0) {
|
||||
return insertPurchaseCheckDetails(tmTaskRequestVo.getLeaseApplyDetailsList(), tmTask.getTaskId());
|
||||
|
|
|
|||
|
|
@ -37,9 +37,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
where bai.status = '1'
|
||||
<if test="keyWord != null and keyWord != ''">
|
||||
and (bai.contract_code like concat('%', #{keyWord}, '%') or
|
||||
bai.agreement_code like concat('%', #{keyWord}, '%') or
|
||||
auth_person like concat('%', #{keyWord}, '%') or
|
||||
phone like concat('%', #{keyWord}, '%'))
|
||||
</if>
|
||||
<if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
|
||||
<![CDATA[ AND DATE_FORMAT( bai.plan_start_time, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime} ]]>
|
||||
</if>
|
||||
<if test="status != null and status != ''">
|
||||
AND bai.`status` = #{status}
|
||||
</if>
|
||||
<if test="agreementCode != null and agreementCode != ''">
|
||||
and bai.agreement_code like concat('%', #{agreementCode}, '%')
|
||||
</if>
|
||||
|
|
|
|||
|
|
@ -32,25 +32,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
</select>
|
||||
|
||||
<insert id="insertTmTaskAgreement" parameterType="com.bonus.material.task.domain.TmTaskAgreement" useGeneratedKeys="true" keyProperty="taskId">
|
||||
insert into tm_task_agreement
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="agreementId != null">agreement_id,</if>
|
||||
<if test="createBy != null">create_by,</if>
|
||||
<if test="createTime != null">create_time,</if>
|
||||
<if test="updateBy != null">update_by,</if>
|
||||
<if test="updateTime != null">update_time,</if>
|
||||
<if test="remark != null">remark,</if>
|
||||
<if test="companyId != null">company_id,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="agreementId != null">#{agreementId},</if>
|
||||
<if test="createBy != null">#{createBy},</if>
|
||||
<if test="createTime != null">#{createTime},</if>
|
||||
<if test="updateBy != null">#{updateBy},</if>
|
||||
<if test="updateTime != null">#{updateTime},</if>
|
||||
<if test="remark != null">#{remark},</if>
|
||||
<if test="companyId != null">#{companyId},</if>
|
||||
</trim>
|
||||
INSERT INTO tm_task_agreement (task_id, agreement_id, create_by, create_time, company_id)
|
||||
VALUES(#{taskId},#{agreementId},#{createBy},NOW(),#{companyId})
|
||||
</insert>
|
||||
|
||||
<update id="updateTmTaskAgreement" parameterType="com.bonus.material.task.domain.TmTaskAgreement">
|
||||
|
|
|
|||
|
|
@ -134,15 +134,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
tt.*, su.phonenumber AS phoneNumber, sd.dept_name as deptName,
|
||||
bpl.pro_id as proId,bpl.pro_name as projectName,
|
||||
bui.unit_id as unitId,bui.unit_name as unitName,
|
||||
lai.lease_person as leasePerson, lai.phone as leasePhone, tt.create_by as applyFor,d.`name` as taskName,lai.lease_type as leaseType,lai.estimate_lease_time as estimateLeaseTime,
|
||||
case when d.id = '31' then lai.company_audit_remark
|
||||
when d.id = '32' then lai.dept_audit_remark
|
||||
when d.id = '33' then lai.direct_audit_remark
|
||||
when d.id = '98' then lai.company_audit_remark
|
||||
when d.id = '99' then lai.dept_audit_remark
|
||||
when d.id = '100' then lai.direct_audit_remark
|
||||
end examineStatus,
|
||||
d.id as examineStatusId,
|
||||
lai.lease_person as leasePerson, lai.phone as leasePhone, tt.create_by as applyFor,
|
||||
-- d.`name` as taskName,
|
||||
lai.lease_type as leaseType,lai.estimate_lease_time as estimateLeaseTime,
|
||||
-- case when d.id = '31' then lai.company_audit_remark
|
||||
-- when d.id = '32' then lai.dept_audit_remark
|
||||
-- when d.id = '33' then lai.direct_audit_remark
|
||||
-- when d.id = '98' then lai.company_audit_remark
|
||||
-- when d.id = '99' then lai.dept_audit_remark
|
||||
-- when d.id = '100' then lai.direct_audit_remark
|
||||
-- end examineStatus,
|
||||
-- d.id as examineStatusId,
|
||||
bai.agreement_code as agreementCode,
|
||||
tt.create_time as createTimes, tt.update_time as updateTimes
|
||||
FROM
|
||||
|
|
@ -154,9 +156,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
LEFT JOIN bm_project bpl ON bpl.pro_id = bai.project_id
|
||||
LEFT JOIN bm_unit bui ON bui.unit_id = bai.unit_id
|
||||
LEFT JOIN lease_apply_info lai ON lai.task_id = tt.task_id
|
||||
LEFT JOIN sys_dic d ON d.id = tt.task_status
|
||||
-- LEFT JOIN sys_dic d ON d.id = tt.task_status
|
||||
WHERE
|
||||
tt.task_type = '29' and tt.status = '1'
|
||||
tt.task_type = 2 and tt.status = '1'
|
||||
<if test="record.taskId != null and record.taskId != '' ">
|
||||
AND tt.task_id = #{record.taskId}
|
||||
</if>
|
||||
|
|
@ -186,15 +188,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
tt.*, su.phonenumber AS phoneNumber, sd.dept_name as deptName,
|
||||
bpl.pro_id as proId,bpl.pro_name as projectName,
|
||||
bui.unit_id as unitId,bui.unit_name as unitName,
|
||||
lai.lease_person as leasePerson, lai.phone as leasePhone, tt.create_by as applyFor,d.`name` as taskName,lai.lease_type as leaseType,lai.estimate_lease_time as estimateLeaseTime,
|
||||
case when d.id = '31' then lai.company_audit_remark
|
||||
when d.id = '32' then lai.dept_audit_remark
|
||||
when d.id = '33' then lai.direct_audit_remark
|
||||
when d.id = '98' then lai.company_audit_remark
|
||||
when d.id = '99' then lai.dept_audit_remark
|
||||
when d.id = '100' then lai.direct_audit_remark
|
||||
end examineStatus ,
|
||||
d.id as examineStatusId,
|
||||
lai.lease_person as leasePerson, lai.phone as leasePhone, tt.create_by as applyFor,
|
||||
-- d.`name` as taskName,
|
||||
lai.lease_type as leaseType,lai.estimate_lease_time as estimateLeaseTime,
|
||||
-- case when d.id = '31' then lai.company_audit_remark
|
||||
-- when d.id = '32' then lai.dept_audit_remark
|
||||
-- when d.id = '33' then lai.direct_audit_remark
|
||||
-- when d.id = '98' then lai.company_audit_remark
|
||||
-- when d.id = '99' then lai.dept_audit_remark
|
||||
-- when d.id = '100' then lai.direct_audit_remark
|
||||
-- end examineStatus ,
|
||||
-- d.id as examineStatusId,
|
||||
bai.agreement_code as agreementCode,
|
||||
tt.create_time as createTimes, tt.update_time as updateTimes
|
||||
FROM
|
||||
|
|
@ -206,9 +210,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
LEFT JOIN bm_project bpl ON bpl.pro_id = bai.project_id
|
||||
LEFT JOIN bm_unit bui ON bui.unit_id = bai.unit_id
|
||||
LEFT JOIN lease_apply_info lai ON lai.task_id = tt.task_id
|
||||
LEFT JOIN sys_dic d ON d.id = tt.task_status
|
||||
-- LEFT JOIN sys_dic d ON d.id = tt.task_status
|
||||
WHERE
|
||||
tt.task_type = '29' and tt.status = '1' and tt.create_by = #{record.createBy}
|
||||
tt.task_type = 2 and tt.status = '1' and tt.create_by = #{record.createBy}
|
||||
<if test="record.taskId != null and record.taskId != '' ">
|
||||
AND tt.task_id = #{record.taskId}
|
||||
</if>
|
||||
|
|
|
|||
Loading…
Reference in New Issue