From 3e32f0087d1b9cfa9f059b30cef03dd0aa5cbf2c Mon Sep 17 00:00:00 2001 From: "liang.chao" Date: Fri, 22 Mar 2024 17:38:48 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/sgzb/base/api/domain/MaType.java | 13 +++- .../sgzb/app/controller/TmTaskController.java | 1 + .../bonus/sgzb/app/domain/LeaseApplyInfo.java | 5 ++ .../com/bonus/sgzb/app/domain/TmTask.java | 8 ++- .../app/service/impl/TmTaskServiceImpl.java | 1 + .../controller/BmProjectLotController.java | 38 ++++++---- .../base/controller/MaPropInfoController.java | 70 +++++++++++++------ .../com/bonus/sgzb/base/vo/MaLabelBindVO.java | 17 +++-- .../mapper/app/LeaseApplyInfoMapper.xml | 6 ++ .../resources/mapper/app/TmTaskMapper.xml | 26 ++++--- .../mapper/base/MaPropInfoMapper.xml | 2 +- .../resources/mapper/system/SysUserMapper.xml | 2 +- 12 files changed, 132 insertions(+), 57 deletions(-) diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaType.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaType.java index c76133f0..39f5dcc3 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaType.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaType.java @@ -1,5 +1,6 @@ package com.bonus.sgzb.base.api.domain; +import com.bonus.sgzb.common.core.annotation.Excel; import com.bonus.sgzb.common.core.web.domain.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonInclude; @@ -30,6 +31,7 @@ public class MaType extends BaseEntity { /** 类型名称 */ @ApiModelProperty(value = "类型名称") + @Excel(name = "名称") private String typeName; /** 类型ID */ @@ -58,6 +60,7 @@ public class MaType extends BaseEntity { /** 计量单位 */ @ApiModelProperty(value = "计量单位") + @Excel(name = "计量单位") private String unitName; /** 管理方式 */ @@ -66,6 +69,7 @@ public class MaType extends BaseEntity { /** 租赁单价 */ @ApiModelProperty(value = "租赁单价") + @Excel(name = "租赁价格") private String leasePrice; /** 租赁单价 */ @@ -79,10 +83,12 @@ public class MaType extends BaseEntity { /** 原价 */ @ApiModelProperty(value = "原价") + @Excel(name = "原值") private String buyPrice; /** 丢失赔偿价 */ - @ApiModelProperty(value = "丢失赔偿价") + @ApiModelProperty(value = "丢失|赔偿价") + @Excel(name = "丢失赔偿价") private String payPrice; /** 层级 */ @@ -137,6 +143,7 @@ public class MaType extends BaseEntity { /** 备注 */ @ApiModelProperty(value = "备注") + @Excel(name = "备注信息") private String remark; /** 数据所属组织 */ @@ -145,6 +152,7 @@ public class MaType extends BaseEntity { /** 图片名称 */ @ApiModelProperty(value = "图片名称") + @Excel(name = "图片") private String photoName; /** 图片路径 */ @@ -154,6 +162,7 @@ public class MaType extends BaseEntity { /** 文档名称 */ @ApiModelProperty(value = "文档名称") + @Excel(name = "文档资料") private String documentName; /** 文档路径 */ @@ -166,6 +175,7 @@ public class MaType extends BaseEntity { /** 库管员名称 */ @ApiModelProperty(value = "库管员名称") + @Excel(name = "库管员") private String keeperUserName; /** 库管员id */ @@ -182,6 +192,7 @@ public class MaType extends BaseEntity { /** 资产属性名称 */ @ApiModelProperty(value = "资产属性名称") + @Excel(name = "资产属性") private String propName; /** 资产属性名称 */ diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java index 492d94c4..b9eba69d 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java @@ -202,6 +202,7 @@ public class TmTaskController extends BaseController { leaseApplyInfo.setCompanyId(leaseApplyDetailsList.get(0).getCompanyId()); // 设置设备所属分公司,用于交给哪家审核 leaseApplyInfo.setType("2"); // 设置审批层级，先固定2层，后期根据接口传入Type区分来源设定 leaseApplyInfo.setLeaseType(task.getLeaseType()); + leaseApplyInfo.setEstimateLeaseTime(task.getEstimateLeaseTime()); // 创建领料任务，返回领料任务编号 boolean addLeaseTaskResult = leaseApplyInfoService.genderLeaseCode(leaseApplyInfo) > 0; diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyInfo.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyInfo.java index ee94757e..a5a91562 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyInfo.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyInfo.java @@ -162,4 +162,9 @@ public class LeaseApplyInfo implements Serializable { @ApiModelProperty(value="领用类型：0 短期租赁 1长期领用") private String leaseType; + + @ApiModelProperty(value="预领取时间") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") + private Date estimateLeaseTime; } \ No newline at end of file diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java index c63c9db1..4e58b813 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java @@ -1,5 +1,6 @@ package com.bonus.sgzb.app.domain; +import com.alibaba.fastjson2.annotation.JSONField; import com.bonus.sgzb.common.core.annotation.Excel; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; @@ -244,8 +245,9 @@ public class TmTask implements Serializable { private String manageType; private String typeId; - - - + @ApiModelProperty(value="预计领料时间（重庆）") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date estimateLeaseTime; } \ No newline at end of file diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java index 2aeca8b0..40686726 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java @@ -992,6 +992,7 @@ public class TmTaskServiceImpl implements TmTaskService { if (res == 0) { throw new RuntimeException("insertNewData异常"); } + // 再插入lease apply detail res = insertNewDetailData(tmTask); if (res == 0) { throw new RuntimeException("insertNewDetailData异常"); diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/BmProjectLotController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/BmProjectLotController.java index 47c76a1f..54028220 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/BmProjectLotController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/BmProjectLotController.java @@ -1,8 +1,10 @@ package com.bonus.sgzb.base.controller; +import com.bonus.sgzb.base.domain.BmProjectInfo; import com.bonus.sgzb.base.domain.BmProjectLot; import com.bonus.sgzb.base.service.BmProjectLotService; +import com.bonus.sgzb.common.core.utils.poi.ExcelUtil; import com.bonus.sgzb.common.core.web.controller.BaseController; import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.common.core.web.page.TableDataInfo; @@ -15,7 +17,7 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; - +import javax.servlet.http.HttpServletResponse; import java.util.List; /** @@ -26,7 +28,7 @@ import java.util.List; @Api(tags = "标段工程项目") @RestController @RequestMapping("/bmProjectLot") -public class BmProjectLotController extends BaseController{ +public class BmProjectLotController extends BaseController { @Autowired private BmProjectLotService bmProjectLotService; @@ -36,32 +38,43 @@ public class BmProjectLotController extends BaseController{ */ @ApiOperation(value = "获取标段工程项目") @GetMapping("/projectLotAll") - public TableDataInfo getProjectLotAll(BmProjectLot bmProjectLot) - { + public TableDataInfo getProjectLotAll(BmProjectLot bmProjectLot) { startPage(); List list = bmProjectLotService.getProjectLotAll(bmProjectLot); return getDataTable(list); } + /** - * 新增项目管理 + * 获取标段工程项 + */ + @ApiOperation(value = "导出标段工程项目") + @PostMapping("/export") + public void export(HttpServletResponse response, BmProjectLot bmProjectLot) { + startPage(); + List list = bmProjectLotService.getProjectLotAll(bmProjectLot); + ExcelUtil util = new ExcelUtil(BmProjectLot.class); + util.exportExcel(response, list, "标段工程"); + + } + + /** + * 新增项目管理 */ @ApiOperation("新增标段工程项目") @Log(title = "参数管理", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult projectLotAdd(@Validated @RequestBody BmProjectLot bmProjectLot) - { + public AjaxResult projectLotAdd(@Validated @RequestBody BmProjectLot bmProjectLot) { return toAjax(bmProjectLotService.projectLotAdd(bmProjectLot)); } /** - * 删除项目管理 + * 删除项目管理 */ @ApiOperation("删除项目管理") @Log(title = "参数管理", businessType = BusinessType.DELETE) - @DeleteMapping ("/{lotId}") - public AjaxResult deleteProjectLotById(@PathVariable Long lotId) - { + @DeleteMapping("/{lotId}") + public AjaxResult deleteProjectLotById(@PathVariable Long lotId) { bmProjectLotService.deleteProjectLotById(lotId); return success(); } @@ -72,8 +85,7 @@ public class BmProjectLotController extends BaseController{ @ApiOperation("修改项目管理") @Log(title = "参数管理", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@Validated @RequestBody BmProjectLot bmProjectLot) - { + public AjaxResult edit(@Validated @RequestBody BmProjectLot bmProjectLot) { return toAjax(bmProjectLotService.updateBmProjectLot(bmProjectLot)); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaPropInfoController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaPropInfoController.java index f33a8576..05da7a61 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaPropInfoController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaPropInfoController.java @@ -36,7 +36,7 @@ import java.util.List; @Api(tags = "资产管理") @RestController @RequestMapping("maPropInfo") -public class MaPropInfoController extends BaseController { +public class MaPropInfoController extends BaseController { /** * 服务对象 */ @@ -46,49 +46,54 @@ public class MaPropInfoController extends BaseController { /** * 查询资产属性列表 + * * @param maPropInfo * @return */ @GetMapping("/list") @ApiOperation(value = "查询资产属性列表") - public TableDataInfo list(MaPropInfo maPropInfo) - { + public TableDataInfo list(MaPropInfo maPropInfo) { startPage(); List list = maPropInfoService.selectMaPropInfoList(maPropInfo); return getDataTable(list); } + /** * 查询资产属性列表 - * @param查询资产属性列表 + * * @return + * @param查询资产属性列表 */ @GetMapping("/lists") @ApiOperation(value = "查询资产属性列表") - public TableDataInfo list(String bindingName) - { + public TableDataInfo list(String bindingName) { List list = maPropInfoService.selectMaPropInfoLists(bindingName); return getDataTable(list); } + /** * 根据类型名称查询类型 + * * @return 结果 */ @ApiOperation(value = "根据类型名称查询类型") @GetMapping("/getMaTypeList") - public TableDataInfo getMaTypeList(String typeName){ + public TableDataInfo getMaTypeList(String typeName) { startPage(); List maTypeList = maPropInfoService.selectMaType(typeName); return getDataTable(maTypeList); } + /** * 资产属性配置保存 + * * @param maPropSet * @return */ @ApiOperation(value = "资产属性配置保存") @Log(title = "参数管理", businessType = BusinessType.INSERT) @PostMapping("/save") - public AjaxResult save(@Validated @RequestBody MaPropSet maPropSet){ + public AjaxResult save(@Validated @RequestBody MaPropSet maPropSet) { // Long fieldValue =maPropSet.getTypeId(); // Long fieldValues =maPropSet.getPropId(); // if (maPropSet.getPropName() != null){ @@ -98,43 +103,47 @@ public class MaPropInfoController extends BaseController { return toAjax(maPropInfoService.save(maPropSet)); } + /** * 新建资产属性 + * * @param maPropInfo * @return */ @ApiOperation(value = "新建资产属性") @Log(title = "参数管理", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@Validated @RequestBody MaPropInfo maPropInfo){ + public AjaxResult add(@Validated @RequestBody MaPropInfo maPropInfo) { if (!maPropInfoService.checkPropNameUnique(maPropInfo)) { return error("新增资产名称'" + maPropInfo.getPropName() + "'失败，资产名称已存在"); } - maPropInfo.setCreateBy(SecurityUtils.getUsername()); + maPropInfo.setCreateBy(SecurityUtils.getLoginUser().getUsername()); return toAjax(maPropInfoService.insertMaPropInfo(maPropInfo)); } /** * 删除资产管理 + * * @param propId * @return */ @ApiOperation(value = "删除资产管理") @Log(title = "参数管理", businessType = BusinessType.DELETE) @DeleteMapping("/{propId}") - public AjaxResult delete(@PathVariable("propId") Long propId){ + public AjaxResult delete(@PathVariable("propId") Long propId) { return toAjax(maPropInfoService.deleteMaPropById(propId)); } /** * 修改资产管理 + * * @param maPropInfo * @return */ @ApiOperation(value = "修改资产管理") @Log(title = "参数管理", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult update(@Validated @RequestBody MaPropInfo maPropInfo){ + public AjaxResult update(@Validated @RequestBody MaPropInfo maPropInfo) { if (!maPropInfoService.checkPropNameUnique(maPropInfo)) { return error("新增资产名称'" + maPropInfo.getPropName() + "'失败，资产名称已存在"); } @@ -143,22 +152,38 @@ public class MaPropInfoController extends BaseController { } /** - * 资产属性导出 + * 资产属性管理导出 + * * @param response - * @param propName + * @param maPropInfo */ - @ApiOperation(value = "资产属性导出") - @Log(title = "资产属性导出", businessType = BusinessType.EXPORT) + @ApiOperation(value = "资产属性管理导出") + @Log(title = "资产属性管理导出", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(HttpServletResponse response, String propName) - { - // List list = maPropInfoService.selectMaPropInfoList(propName); - // ExcelUtil util = new ExcelUtil(MaPropInfo.class); - // util.exportExcel(response, list, "资产属性类型数据"); + public void export(HttpServletResponse response, MaPropInfo maPropInfo) { + List list = maPropInfoService.selectMaPropInfoList(maPropInfo); + ExcelUtil util = new ExcelUtil(MaPropInfo.class); + util.exportExcel(response, list, "资产属性管理数据"); + } + + /** + * 资产属性配置导出 + * + * @param response + * @param typeName + */ + @ApiOperation(value = "资产属性配置导出") + @Log(title = "资产属性配置导出", businessType = BusinessType.EXPORT) + @PostMapping("/exportConfig") + public void exportConfig(HttpServletResponse response, String typeName) { + List list = maPropInfoService.selectMaType(typeName); + ExcelUtil util = new ExcelUtil(MaType.class); + util.exportExcel(response, list, "资产属性配置数据"); } /** * 资产属性管理导入 + * * @param file * @param updateSupport * @return @@ -167,8 +192,7 @@ public class MaPropInfoController extends BaseController { @ApiOperation(value = "资产属性管理导入") @Log(title = "资产属性管理导入", businessType = BusinessType.IMPORT) @PostMapping("/importData") - public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception - { + public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception { String fileName = file.getOriginalFilename(); if (fileName != null) { String fileExtension = fileName.substring(fileName.lastIndexOf(".") + 1); diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/vo/MaLabelBindVO.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/vo/MaLabelBindVO.java index 88bdeeed..1fa122c5 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/vo/MaLabelBindVO.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/vo/MaLabelBindVO.java @@ -1,5 +1,6 @@ package com.bonus.sgzb.base.vo; +import com.bonus.sgzb.common.core.annotation.Excel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; @@ -25,6 +26,7 @@ public class MaLabelBindVO { private Long labelType; //标签编号 + @Excel(name = "标签编号", sort = 2) @ApiModelProperty(value = "标签编号") private String labelCode; @@ -34,6 +36,7 @@ public class MaLabelBindVO { //绑定时间 @ApiModelProperty(value = "绑定时间") + @Excel(name = "绑定时间", sort = 8) private String bindTime; //是否绑定(0 是, 1 否) @@ -41,37 +44,43 @@ public class MaLabelBindVO { private String isBind; //规格型号 @ApiModelProperty(value = "规格型号") + @Excel(name = "规格型号", sort = 5) private String typeName; @ApiModelProperty(value = "规格型号") private String modelId; //设备类型 @ApiModelProperty(value = "设备类型") + @Excel(name = "物品名称", sort = 4) private String modelName; //物品种类 @ApiModelProperty(value = "物品种类") private String wpName; //物品种类 @ApiModelProperty(value = "物品种类") + @Excel(name = "物品类型", sort = 3) private String kindName; //机具编号 - @ApiModelProperty(value = "类型名称") + @ApiModelProperty(value = "设备编码") + @Excel(name = "设备编码", sort = 6) private String maCode; //机具编号 - @ApiModelProperty(value = "类型名称") + @ApiModelProperty(value = "机具id") private String maId; //机具编号 @ApiModelProperty(value = "组织") private String companyId; @ApiModelProperty(value = "物品种类") + @Excel(name = "标签类型", sort = 1) private String name; //是否绑定(0 是, 1 否) - @ApiModelProperty(value = "狀態") + @ApiModelProperty(value = "状态") + @Excel(name = "操作类型", sort = 9, readConverterExp = "1=正常") private String status; @ApiModelProperty(value = "用户姓名") + @Excel(name = "绑定人员", sort = 7) private String userName; - @ApiModelProperty(value = "中间表主键") private String id; diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseApplyInfoMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseApplyInfoMapper.xml index 29eddab4..4df5d8f8 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseApplyInfoMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseApplyInfoMapper.xml @@ -125,6 +125,9 @@ lease_type, + + estimate_lease_time, + @@ -181,6 +184,9 @@ #{leaseType,jdbcType=VARCHAR}, + + #{estimateLeaseTime,jdbcType=TIMESTAMP}, + diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml index e08373df..4a262edd 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml @@ -458,14 +458,14 @@ tt.*, su.phonenumber AS phoneNumber, sd.dept_name as deptName, bpl.lot_id as proId,bpl.lot_name as proName, 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.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 = '30' then lai.company_audit_remark when d.id = '31' then lai.dept_audit_remark when d.id = '32' 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 , + end examineStatus, d.id as examineStatusId, bai.agreement_code as agreementCode, tt.create_time as createTimes, tt.update_time as updateTimes @@ -494,11 +494,12 @@ - AND bpi.pro_id = #{record.projectId} + AND bpl.lot_id = #{record.projectId} - AND bai.agreement_code like concat('%', #{record.keyWord}, '%') + AND (bai.agreement_code like concat('%', #{record.keyWord}, '%') or + tt.code like concat('%', #{record.keyWord}, '%')) ORDER BY tt.update_time DESC @@ -508,7 +509,7 @@ tt.*, su.phonenumber AS phoneNumber, sd.dept_name as deptName, bpl.lot_id as proId,bpl.lot_name as proName, 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_person as leasePerson, lai.phone as leasePhone,lai.lease_type as leaseType, lai.estimate_lease_time as estimateLeaseTime,tt.create_by as applyFor,d.`name` as taskName, case when d.id = '30' then lai.company_audit_remark when d.id = '31' then lai.dept_audit_remark when d.id = '32' then lai.direct_audit_remark @@ -544,7 +545,7 @@ - AND bpi.pro_id = #{record.projectId} + AND bpl.lot_id = #{record.projectId} @@ -626,6 +627,7 @@ lai.direct_audit_time as directAuditTime, lai.direct_audit_remark as directAuditRemark, lai.lease_type as leaseType, + lai.estimate_lease_time as estimateLeaseTime, d.id as examineStatusId, bai.agreement_code as agreementCode, @@ -710,6 +712,7 @@ company_audit_by = #{record.companyAuditBy}, company_audit_time = now(), company_audit_remark = #{record.companyAuditRemark}, + status = #{record.status}, dept_audit_by = #{record.companyAuditBy}, @@ -808,7 +811,7 @@ tt.*, su.phonenumber AS phoneNumber, sd.dept_name as deptName, bpl.lot_id as proId,bpl.lot_name as proName, 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.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 = '30' then lai.company_audit_remark when d.id = '31' then lai.dept_audit_remark when d.id = '32' then lai.direct_audit_remark @@ -844,11 +847,12 @@ - AND bpi.pro_id = #{record.projectId} + AND bpl.lot_id = #{record.projectId} - AND bai.agreement_code like concat('%', #{record.keyWord}, '%') + AND (bai.agreement_code like concat('%', #{record.keyWord}, '%') or + tt.code like concat('%', #{record.keyWord}, '%')) ORDER BY tt.update_time DESC @@ -912,7 +916,7 @@ LEFT JOIN lease_apply_details lad on lai.id = lad.parennt_id LEFT JOIN ma_type_keeper mtk on lad.type_id = mtk.type_id WHERE tt.task_status in(33,34,35) - + and mtk.user_id = #{userId} GROUP BY lai.id @@ -937,7 +941,7 @@ LEFT JOIN ma_type_keeper mtk on lad.type_id = mtk.type_id WHERE lad.parennt_id = #{id} - + and mtk.user_id = #{userId} diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaPropInfoMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaPropInfoMapper.xml index aae364b2..c6194f1c 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaPropInfoMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaPropInfoMapper.xml @@ -224,7 +224,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"