Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
0a0ff016e7
|
|
@ -41,8 +41,8 @@ public class BmAgreementInfo extends BaseEntity
|
|||
private Date signTime;
|
||||
|
||||
/** 往来单位id */
|
||||
@Excel(name = "往来单位id")
|
||||
@ApiModelProperty(value = "往来单位id")
|
||||
//@Excel(name = "往来单位ID")
|
||||
@ApiModelProperty(value = "往来单位ID")
|
||||
@NotNull(message = "往来单位id不能为空")
|
||||
private Long unitId;
|
||||
|
||||
|
|
@ -54,7 +54,7 @@ public class BmAgreementInfo extends BaseEntity
|
|||
private String unitName;
|
||||
|
||||
/** 工程标段ID */
|
||||
@Excel(name = "工程标段ID")
|
||||
//@Excel(name = "工程标段ID")
|
||||
@ApiModelProperty(value = "工程标段ID")
|
||||
@NotNull(message = "工程标段ID不能为空")
|
||||
private Long projectId;
|
||||
|
|
@ -91,32 +91,32 @@ public class BmAgreementInfo extends BaseEntity
|
|||
private String phone;
|
||||
|
||||
/** 数据所属组织 */
|
||||
@Excel(name = "数据所属组织")
|
||||
//@Excel(name = "数据所属组织")
|
||||
@ApiModelProperty(value = "数据所属组织")
|
||||
private Long companyId;
|
||||
|
||||
/** 文件名 */
|
||||
@Excel(name = "文件名")
|
||||
@ApiModelProperty(value = "文件名")
|
||||
private String fileName;
|
||||
|
||||
/** 文件URL */
|
||||
@Excel(name = "文件URL")
|
||||
@ApiModelProperty(value = "文件URL")
|
||||
private String fileUrl;
|
||||
// /** 文件名 */
|
||||
// @Excel(name = "文件名")
|
||||
// @ApiModelProperty(value = "文件名")
|
||||
// private String fileName;
|
||||
//
|
||||
// /** 文件URL */
|
||||
// @Excel(name = "文件URL")
|
||||
// @ApiModelProperty(value = "文件URL")
|
||||
// private String fileUrl;
|
||||
|
||||
/** 0删除 1启用 */
|
||||
@Excel(name = "0删除1启用")
|
||||
@Excel(name = "是否启用", readConverterExp = "0=删除,1=启用")
|
||||
@ApiModelProperty(value = "0删除 1启用")
|
||||
private String status;
|
||||
|
||||
/** 1内部单位 2外部单位 */
|
||||
@Excel(name = "1内部单位 2外部单位")
|
||||
@Excel(name = "内外部单位", readConverterExp = "1=内部单位,2=外部单位")
|
||||
@ApiModelProperty(value = "1内部单位 2外部单位")
|
||||
private String protocol;
|
||||
|
||||
/** 是否结算（0 结算中 1已结算） */
|
||||
@Excel(name = "是否结算", readConverterExp = "0=,结=算中,1=已结算")
|
||||
@Excel(name = "是否结算", readConverterExp = "0=结算中,1=已结算")
|
||||
private Long isSlt;
|
||||
|
||||
@ApiModelProperty(value = "关键词")
|
||||
|
|
|
|||
|
|
@ -12,11 +12,10 @@ import com.bonus.common.core.web.domain.BaseEntity;
|
|||
* @author xsheng
|
||||
* @date 2024-10-16
|
||||
*/
|
||||
|
||||
|
||||
@Data
|
||||
@ToString
|
||||
public class LeaseApplyDetails extends BaseEntity {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** ID */
|
||||
|
|
|
|||
|
|
@ -148,6 +148,9 @@ public class LeaseApplyInfo extends BaseEntity {
|
|||
@ApiModelProperty(value = "租赁单位id")
|
||||
private Integer leaseUnitId;
|
||||
|
||||
@ApiModelProperty(value = "协议id")
|
||||
private Long agreementId;
|
||||
|
||||
@ApiModelProperty(value = "协议号")
|
||||
private String agreementCode;
|
||||
|
||||
|
|
|
|||
|
|
@ -98,6 +98,9 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService {
|
|||
*/
|
||||
@Override
|
||||
public AjaxResult insertLeaseApplyInfo(TmTaskRequestVo tmTaskRequestVo) {
|
||||
if (tmTaskRequestVo.getLeaseApplyInfo() == null) {
|
||||
return AjaxResult.error("请先填写领料任务信息");
|
||||
}
|
||||
tmTaskRequestVo.getLeaseApplyInfo().setCreateTime(DateUtils.getNowDate());
|
||||
tmTaskRequestVo.getLeaseApplyInfo().setCreateBy(SecurityUtils.getUsername());
|
||||
try {
|
||||
|
|
@ -109,7 +112,7 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService {
|
|||
tmTask.setCreateTime(DateUtils.getNowDate());
|
||||
tmTask.setCreateBy(SecurityUtils.getUsername());
|
||||
tmTaskMapper.insertTmTask(tmTask);
|
||||
TmTaskAgreement tmTaskAgreement = new TmTaskAgreement(tmTask.getTaskId(), tmTaskRequestVo.getAgreementId());
|
||||
TmTaskAgreement tmTaskAgreement = new TmTaskAgreement(tmTask.getTaskId(), tmTaskRequestVo.getLeaseApplyInfo().getAgreementId());
|
||||
tmTaskAgreement.setCreateTime(DateUtils.getNowDate());
|
||||
tmTaskAgreement.setCreateBy(SecurityUtils.getUsername());
|
||||
tmTaskAgreementMapper.insertTmTaskAgreement(tmTaskAgreement);
|
||||
|
|
|
|||
|
|
@ -37,8 +37,8 @@ public class TmTask extends BaseEntity {
|
|||
private Integer taskStatus;
|
||||
|
||||
/** 编号 */
|
||||
@Excel(name = "编号")
|
||||
@ApiModelProperty(value = "编号")
|
||||
@Excel(name = "任务编号")
|
||||
@ApiModelProperty(value = "任务编号，如新购单号，领料单号，退料单号等")
|
||||
private String code;
|
||||
|
||||
/** 数据所属组织 */
|
||||
|
|
|
|||
|
|
@ -24,8 +24,8 @@ public class TmTaskRequestVo extends BaseEntity {
|
|||
@ApiModelProperty(value = "任务状态(定义数据字典)")
|
||||
private Integer taskStatus;
|
||||
|
||||
/** 编号 */
|
||||
@Excel(name = "编号")
|
||||
/** 任务编号，如新购单号，领料单号，退料单号等 */
|
||||
@Excel(name = "任务编号")
|
||||
@ApiModelProperty(value = "编号")
|
||||
private String code;
|
||||
|
||||
|
|
|
|||
|
|
@ -144,7 +144,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
WHEN 0 THEN
|
||||
IFNULL(subquery0.num, 0)
|
||||
ELSE
|
||||
IFNULL(mt.num, 0)
|
||||
IFNULL(mt.storage_num, 0)
|
||||
END as num
|
||||
FROM ma_type mt
|
||||
left join (SELECT mt.type_id,
|
||||
|
|
|
|||
|
|
@ -131,20 +131,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
|
||||
<select id="getAuditListByLeaseTmTask" resultType="com.bonus.material.task.domain.vo.TmTaskRequestVo">
|
||||
SELECT DISTINCT
|
||||
tt.*, su.phonenumber AS phoneNumber, sd.dept_name as deptName,
|
||||
tt.task_id as taskId, tt.task_type as taskType, tt.task_status as taskStatus, tt.status, tt.code,
|
||||
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,
|
||||
bai.agreement_code as agreementCode,
|
||||
tt.create_time as createTimes, tt.update_time as updateTimes
|
||||
FROM
|
||||
|
|
@ -156,7 +148,6 @@ 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
|
||||
WHERE
|
||||
tt.task_type = 2 and tt.status = '1'
|
||||
<if test="record.taskId != null and record.taskId != '' ">
|
||||
|
|
@ -250,7 +241,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
SELECT
|
||||
lad.*, mt.type_name AS typeModelName, mt1.type_name AS typeName,mt.unit_name as unitName, mt.manage_type as manageType,
|
||||
case WHEN mt.manage_type = '0' then '编号' else '计数' end manageTypeName,
|
||||
mt.num, (lad.pre_num - IF(lad.al_num IS NULL,'0',lad.al_num)) AS outNum,mm.ma_code as maCode
|
||||
mt.storage_num, (lad.pre_num - IF(lad.al_num IS NULL,'0',lad.al_num)) AS outNum,mm.ma_code as maCode
|
||||
FROM
|
||||
lease_apply_details lad
|
||||
LEFT JOIN ma_type mt ON lad.type_id = mt.type_id
|
||||
|
|
|
|||
Loading…
Reference in New Issue