From 32f76784271f6577e84d1bbbe3627482f1c8d535 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Sun, 8 Aug 2021 10:41:26 +0800 Subject: [PATCH 1/5] =?UTF-8?q?ky=20=20=E4=B8=8A=E4=BC=A0=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E7=B1=BB=E5=9E=8B=E9=99=90=E5=88=B6=EF=BC=81=EF=BC=81?= =?UTF-8?q?=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adc-da-main/src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-main/src/main/resources/application.properties b/adc-da-main/src/main/resources/application.properties index 8412c5be..27bb37f1 100644 --- a/adc-da-main/src/main/resources/application.properties +++ b/adc-da-main/src/main/resources/application.properties @@ -137,7 +137,7 @@ file.path=D:/uploadfile/bus # 文件下载地址参数 file.downloadUrl=http://39.98.140.126:10001/uploadPath #上传文件白名单-以,分隔 -upload.file.white.lists = doc,docx,xls,xlsx,pdf,PDF,png,jpg +upload.file.white.lists = doc,docx,xls,xlsx,pdf,PDF,png,jpg,pptx,ppt # ============================================================================= # elasticsearch 配置 From 6058cc036c57af0220de6213640decbff059bc08 Mon Sep 17 00:00:00 2001 From: "Mr.Z" <709235321@qq.com> Date: Sun, 8 Aug 2021 14:04:29 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=90=88=E8=A7=84?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E7=BB=93=E6=9E=9C-=E6=8A=80=E6=9C=AF?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E7=BB=93=E6=9E=9C=20=E5=9B=9E=E6=98=BE?= =?UTF-8?q?=E4=B8=8D=E6=AD=A3=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarStandardComplianceAssessResultController.java | 1 + .../entity/SarInterpretationNationalStandard.java | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java index 0a99a2cc..36f7e23c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java @@ -83,6 +83,7 @@ public class SarStandardComplianceAssessResultController { queryWrapper.like("STAND_NUMBER",eo.getStandNumber().trim()); } IPage page = iSarInterpretationNationalStandardService.page(iPage, queryWrapper); + while(page.getRecords().remove(null)); return Result.success(page); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationNationalStandard.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationNationalStandard.java index 7a8f4972..94acce6d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationNationalStandard.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationNationalStandard.java @@ -5,11 +5,13 @@ import java.time.LocalDateTime; import java.util.Date; import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; /** *

@@ -84,6 +86,8 @@ public class SarInterpretationNationalStandard extends BaseEntity { @ApiModelProperty(value = "评估时间") @TableField("INTERPRETATION_TIME") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") private Date interpretationTime; @TableField("ID") From b0eeb87bd1ded7e6c40fce53fe838f93ff35bf10 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Sun, 8 Aug 2021 22:40:37 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=AF=A6=E6=83=85->?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=88=86=E8=A7=A3=E5=8D=95=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarStandItemsController.java | 16 +- .../sarStandItems/dao/SarStandItemsDao.java | 6 +- .../entity/FindSarItemsPageReqDTO.java | 36 ++ .../slrs/sarStandItems/entity/SarItemVO.java | 67 +++ .../impl/SarStandItemsServiceImpl.java | 5 + .../SarStandItems/SarStandItemsMapper.xml | 502 ++++++++++-------- 6 files changed, 414 insertions(+), 218 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindSarItemsPageReqDTO.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarItemVO.java diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java index 993de484..bcfcb637 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java @@ -5,16 +5,13 @@ import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.slrs.sarLawsAttrDetailedList.entity.LawsDto; -import com.adc.da.slrs.sarStandItems.entity.FindStandDto; -import com.adc.da.slrs.sarStandItems.entity.SarItemsTime; -import com.adc.da.slrs.sarStandItems.entity.SarStandItemsDto; +import com.adc.da.slrs.sarStandItems.entity.*; import com.adc.da.slrs.sarStandItems.service.impl.SarStandItemsServiceImpl; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import com.adc.da.slrs.sarStandItems.entity.SarStandItems; import io.swagger.annotations.Api; import com.adc.da.base.web.BaseController; @@ -54,6 +51,17 @@ public class SarStandItemsController extends BaseController { } } + @ApiOperation(value = "分解单查询") + @GetMapping("/querySarItemAndInterpretation") + public ResponseMessage querySarItemAndInterpretation(FindSarItemsPageReqDTO page){ + List sarItemVOS = ServiceImpl.querySarItemAndInterpretation(page); + + return Result.success("200",sarItemVOS); + } + + + + @ApiOperation(value = "分解单查询(带时间)") @GetMapping("/findAllItemsTimes") public List findAllItemsTimes(@RequestParam("type") String type,@RequestParam("ids") String ids){ diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java index 0f5aa0d4..f37ea8b3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java @@ -1,8 +1,6 @@ package com.adc.da.slrs.sarStandItems.dao; -import com.adc.da.slrs.sarStandItems.entity.SarStandItems; -import com.adc.da.slrs.sarStandItems.entity.SarStandItemsDto; -import com.adc.da.slrs.sarStandItems.entity.StandsTimeDto; +import com.adc.da.slrs.sarStandItems.entity.*; import com.adc.da.slrs.sarStandItems.page.SarStandItemsEOPage; import com.adc.da.sys.common.SelectionResult; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -24,6 +22,8 @@ import java.util.Set; @Mapper public interface SarStandItemsDao extends BaseMapper { + List querySarItemAndInterpretation(FindSarItemsPageReqDTO page); + List querySarStandItemsList(SarStandItemsEOPage page); int querySarStandItemsListCount(SarStandItemsEOPage page); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindSarItemsPageReqDTO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindSarItemsPageReqDTO.java new file mode 100644 index 00000000..5ed30c32 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindSarItemsPageReqDTO.java @@ -0,0 +1,36 @@ +package com.adc.da.slrs.sarStandItems.entity; + +import com.adc.da.base.page.BasePage; +import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + + +@Data +public class FindSarItemsPageReqDTO { + + private static final long serialVersionUID = 1L; + private Integer page = 1; + private Integer pageSize = 20; + + + @ApiModelProperty(value = "标准id") + private String standId; + + @ApiModelProperty(value = "条款名称") + private String itemsName; + + @ApiModelProperty(value = "新车型实施日期") + @DateTimeFormat(pattern = "yyy-MM-dd") + private Date XCXSSRQ; + + @ApiModelProperty(value = "在产车实施日期") + @DateTimeFormat(pattern = "yyy-MM-dd") + private Date ZCCSSRQ; + + @ApiModelProperty(value = "文件类型") + private String fileType; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarItemVO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarItemVO.java new file mode 100644 index 00000000..ac471308 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarItemVO.java @@ -0,0 +1,67 @@ +package com.adc.da.slrs.sarStandItems.entity; + +import com.adc.da.base.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +@Data +@ApiModel(value="标准分解单显示对象", description="") +public class SarItemVO extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") + private String id; + + + @ApiModelProperty(value = "标准ID") + private String standId; + + @ApiModelProperty(value = "条款号") + private String itemsNum; + + @ApiModelProperty(value = "条款名称") + private String itemsName; + + @ApiModelProperty(value = "条款内容") + private String itemsTitle; + + @ApiModelProperty(value = "解读内容--条款要求") + private String termsConditions; + + @ApiModelProperty(value = "新车实施日期") + @DateTimeFormat + private Date XCXSSRQ; + + @ApiModelProperty(value = "在产车实施日期") + @DateTimeFormat + private Date ZCCSSRQ; + + @ApiModelProperty(value = "适用车型") + private String applyArctic; + + + @ApiModelProperty(value = "责任部门") + private String responsibleUnit; + + + @ApiModelProperty(value = "责任工程师") + private String dutyEngineer; + + @ApiModelProperty(value = "相对于上一版本变化点") + private String comparedWithPrevious; + + @ApiModelProperty(value = "合规性分析") + private String complianceState; + + @ApiModelProperty(value = "符合性要求-符合性状态") + private String complianceRequire; + + @ApiModelProperty(value = "文件类型") + private String fileType; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java index c06fe3fa..3cdddfce 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java @@ -179,4 +179,9 @@ public class SarStandItemsServiceImpl extends ServiceImpl findAllItems(String type,String[] ids){ return dao.selectAllItemsByIds(type,ids); } + + + public List querySarItemAndInterpretation(FindSarItemsPageReqDTO page){ + return dao.querySarItemAndInterpretation(page); + } } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml index 121a16f4..774efa4c 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml @@ -2,65 +2,82 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + SAR_STAND_ITEMS.modify_time, SAR_STAND_ITEMS.creation_time, SAR_STAND_ITEMS.creation_user, SAR_STAND_ITEMS.valid_flag, SAR_STAND_ITEMS.remarks, SAR_STAND_ITEMS.responsible_unit, SAR_STAND_ITEMS.energy_kind, SAR_STAND_ITEMS.apply_arctic, tack_time, parts, SAR_STAND_ITEMS.items_name, SAR_STAND_ITEMS.items_num, SAR_STAND_ITEMS.stand_id, SAR_STAND_ITEMS.id ,TS_ORG.org_name as responsibleUnitShow,SAR_STAND_ITEMS.MAINPOINTS_IMPEMENTATION,SAR_STAND_ITEMS.TERMS_CONDITIONS,tsFo.UNAME as foShow,SAR_STAND_ITEMS.duty_engineer,SAR_STAND_ITEMS.svpps, SAR_STAND_ITEMS.claim_type,SAR_STAND_ITEMS.bus_stand_cover,SAR_STAND_ITEMS.file_type,dicClaimType.DIC_TYPE_NAME as claimTypeShow,tsdutyEngineer.UNAME as dutyEngineerShow,SAR_STAND_ITEMS.fo - + SAR_STAND_ITEMS.modify_time, SAR_STAND_ITEMS.creation_time, SAR_STAND_ITEMS.creation_user, SAR_STAND_ITEMS.valid_flag, SAR_STAND_ITEMS.remarks, SAR_STAND_ITEMS.responsible_unit, SAR_STAND_ITEMS.energy_kind, SAR_STAND_ITEMS.apply_arctic, tack_time, parts, SAR_STAND_ITEMS.items_name, SAR_STAND_ITEMS.items_num, SAR_STAND_ITEMS.stand_id, SAR_STAND_ITEMS.id ,SAR_STAND_ITEMS.MAINPOINTS_IMPEMENTATION,SAR_STAND_ITEMS.TERMS_CONDITIONS,SAR_STAND_ITEMS.duty_engineer,SAR_STAND_ITEMS.svpps, @@ -69,91 +86,97 @@ - left join SAR_STANDARDS_INFO on (SAR_STANDARDS_INFO.id = SAR_STAND_ITEMS.stand_id and SAR_STANDARDS_INFO.valid_flag=0) - left join TS_DICTYPE dicClaimType on (dicClaimType.dic_type_code = SAR_STAND_ITEMS.claim_type and dicClaimType.dic_id is + left join SAR_STANDARDS_INFO on (SAR_STANDARDS_INFO.id = SAR_STAND_ITEMS.stand_id and + SAR_STANDARDS_INFO.valid_flag=0) + left join TS_DICTYPE dicClaimType on (dicClaimType.dic_type_code = SAR_STAND_ITEMS.claim_type and + dicClaimType.dic_id is not null and dicClaimType.valid_flag = 0) - left join TS_USER tsdutyEngineer on (tsdutyEngineer.USID = SAR_STAND_ITEMS.duty_engineer and tsdutyEngineer.valid_flag=0 + left join TS_USER tsdutyEngineer on (tsdutyEngineer.USID = SAR_STAND_ITEMS.duty_engineer and + tsdutyEngineer.valid_flag=0 and tsdutyEngineer.DISABLE_FLAG=0) - left join TS_USER tsFo on (tsFo.USID = SAR_STAND_ITEMS.fo and tsFo.valid_flag=0 + left join TS_USER tsFo on (tsFo.USID = SAR_STAND_ITEMS.fo and tsFo.valid_flag=0 and tsFo.DISABLE_FLAG=0) where 1=1 - - + + and SAR_STAND_ITEMS.file_type = #{fileType} - + and SAR_STAND_ITEMS.modify_time ${modifyTimeOperator} #{modifyTime} - + and SAR_STAND_ITEMS.modify_time >= #{modifyTime1} - + and SAR_STAND_ITEMS.modify_time <= #{modifyTime2} - + and SAR_STAND_ITEMS.creation_time ${creationTimeOperator} #{creationTime} - + and SAR_STAND_ITEMS.creation_time >= #{creationTime1} - + and SAR_STAND_ITEMS.creation_time <= #{creationTime2} - + and SAR_STAND_ITEMS.creation_user ${creationUserOperator} #{creationUser} - + and SAR_STAND_ITEMS.valid_flag ${validFlagOperator} #{validFlag} - + and SAR_STAND_ITEMS.remarks ${remarksOperator} #{remarks} - + and SAR_STAND_ITEMS.responsible_unit = #{responsibleUnit} - + and SAR_STAND_ITEMS.energy_kind ${energyKindOperator} #{energyKind} - + and SAR_STAND_ITEMS.apply_arctic ${applyArcticOperator} #{applyArctic} - + and SAR_STAND_ITEMS.tack_time ${tackTimeOperator} #{tackTime} - + and SAR_STAND_ITEMS.tack_time >= #{tackTime1} - + and SAR_STAND_ITEMS.tack_time <= #{tackTime2} - + and SAR_STAND_ITEMS.parts like concat(concat('%', #{parts}),'%') - - and (SAR_STAND_ITEMS.items_name like concat(concat('%', #{nameOrRequest}),'%') or SAR_STAND_ITEMS.TERMS_CONDITIONS like concat(concat('%', #{nameOrRequest}),'%')) + + and (SAR_STAND_ITEMS.items_name like concat(concat('%', #{nameOrRequest}),'%') or + SAR_STAND_ITEMS.TERMS_CONDITIONS like concat(concat('%', #{nameOrRequest}),'%')) - + and SAR_STAND_ITEMS.items_name ${itemsNameOperator} #{itemsName} - + and SAR_STAND_ITEMS.items_num ${itemsNumOperator} #{itemsNum} - + and SAR_STAND_ITEMS.stand_id ${standIdOperator} #{standId} - + and ((SAR_STANDARDS_INFO.STAND_SORT || ' ' || SAR_STANDARDS_INFO.STAND_NUMBER || '-' || - SAR_STANDARDS_INFO.STAND_YEAR like concat(concat('%',#{standNum}),'%') and SAR_STANDARDS_INFO.STAND_YEAR is not null) - or (SAR_STANDARDS_INFO.STAND_SORT || ' ' || SAR_STANDARDS_INFO.STAND_NUMBER like concat(concat('%',#{standNum}),'%') + SAR_STANDARDS_INFO.STAND_YEAR like concat(concat('%',#{standNum}),'%') and SAR_STANDARDS_INFO.STAND_YEAR + is not null) + or (SAR_STANDARDS_INFO.STAND_SORT || ' ' || SAR_STANDARDS_INFO.STAND_NUMBER like + concat(concat('%',#{standNum}),'%') and SAR_STANDARDS_INFO.STAND_YEAR is null)) - + and SAR_STAND_ITEMS.id ${idOperator} #{id} - + and SAR_STAND_ITEMS.id != #{noId} - + and SAR_PRODUCT_SAR_STATE.product_id = #{productId} @@ -162,82 +185,86 @@ #{item} - + and (SAR_STAND_ITEMS.claim_type='L7N7EEDAPR' or SAR_STAND_ITEMS.claim_type='RENVECPFGT') - + - insert into SAR_STAND_ITEMS() - values (#{modifyTime, jdbcType=TIMESTAMP}, #{creationTime, jdbcType=TIMESTAMP}, #{creationUser, jdbcType=VARCHAR}, #{validFlag, jdbcType=INTEGER}, #{remarks, jdbcType=VARCHAR}, #{responsibleUnit, jdbcType=VARCHAR}, #{energyKind, jdbcType=VARCHAR}, #{applyArctic, jdbcType=VARCHAR}, #{tackTime, jdbcType=TIMESTAMP}, #{parts, jdbcType=VARCHAR}, #{itemsName, jdbcType=VARCHAR}, #{itemsNum, jdbcType=VARCHAR}, #{standId, jdbcType=VARCHAR}, #{id, jdbcType=VARCHAR}) + insert into SAR_STAND_ITEMS() + values (#{modifyTime, jdbcType=TIMESTAMP}, #{creationTime, jdbcType=TIMESTAMP}, + #{creationUser, jdbcType=VARCHAR}, #{validFlag, jdbcType=INTEGER}, #{remarks, jdbcType=VARCHAR}, + #{responsibleUnit, jdbcType=VARCHAR}, #{energyKind, jdbcType=VARCHAR}, #{applyArctic, jdbcType=VARCHAR}, + #{tackTime, jdbcType=TIMESTAMP}, #{parts, jdbcType=VARCHAR}, #{itemsName, jdbcType=VARCHAR}, + #{itemsNum, jdbcType=VARCHAR}, #{standId, jdbcType=VARCHAR}, #{id, jdbcType=VARCHAR}) - + insert into SAR_STAND_ITEMS - - modify_time, - creation_time, - creation_user, - valid_flag, - remarks, - responsible_unit, - energy_kind, - apply_arctic, - tack_time, - parts, - items_name, - items_num, - stand_id, - id, + + modify_time, + creation_time, + creation_user, + valid_flag, + remarks, + responsible_unit, + energy_kind, + apply_arctic, + tack_time, + parts, + items_name, + items_num, + stand_id, + id, MAINPOINTS_IMPEMENTATION, TERMS_CONDITIONS, - fo, - duty_engineer, - svpps, - claim_type, + fo, + duty_engineer, + svpps, + claim_type, bus_stand_cover, file_type - - #{modifyTime, jdbcType=TIMESTAMP}, - #{creationTime, jdbcType=TIMESTAMP}, - #{creationUser, jdbcType=VARCHAR}, - #{validFlag, jdbcType=INTEGER}, - #{remarks, jdbcType=VARCHAR}, - #{responsibleUnit, jdbcType=VARCHAR}, - #{energyKind, jdbcType=VARCHAR}, - #{applyArctic, jdbcType=VARCHAR}, - #{tackTime, jdbcType=TIMESTAMP}, - #{parts, jdbcType=VARCHAR}, - #{itemsName, jdbcType=VARCHAR}, - #{itemsNum, jdbcType=VARCHAR}, - #{standId, jdbcType=VARCHAR}, - #{id, jdbcType=VARCHAR}, + + #{modifyTime, jdbcType=TIMESTAMP}, + #{creationTime, jdbcType=TIMESTAMP}, + #{creationUser, jdbcType=VARCHAR}, + #{validFlag, jdbcType=INTEGER}, + #{remarks, jdbcType=VARCHAR}, + #{responsibleUnit, jdbcType=VARCHAR}, + #{energyKind, jdbcType=VARCHAR}, + #{applyArctic, jdbcType=VARCHAR}, + #{tackTime, jdbcType=TIMESTAMP}, + #{parts, jdbcType=VARCHAR}, + #{itemsName, jdbcType=VARCHAR}, + #{itemsNum, jdbcType=VARCHAR}, + #{standId, jdbcType=VARCHAR}, + #{id, jdbcType=VARCHAR}, #{mainPointImplementation,jdbcType=VARCHAR}, #{termsConditions,jdbcType=CLOB}, - #{fo, jdbcType=VARCHAR}, - #{dutyEngineer, jdbcType=VARCHAR}, - #{svpps, jdbcType=VARCHAR}, - #{claimType, jdbcType=VARCHAR}, - #{busStandCover, jdbcType=VARCHAR}, - #{fileType, jdbcType=VARCHAR} + #{fo, jdbcType=VARCHAR}, + #{dutyEngineer, jdbcType=VARCHAR}, + #{svpps, jdbcType=VARCHAR}, + #{claimType, jdbcType=VARCHAR}, + #{busStandCover, jdbcType=VARCHAR}, + #{fileType, jdbcType=VARCHAR} - + update SAR_STAND_ITEMS set modify_time = #{modifyTime}, creation_time = #{creationTime}, @@ -258,69 +285,69 @@ update SAR_STAND_ITEMS - - + + modify_time = #{modifyTime}, - + creation_time = #{creationTime}, - + creation_user = #{creationUser}, - + valid_flag = #{validFlag}, - + remarks = #{remarks}, - + responsible_unit = #{responsibleUnit}, - + energy_kind = #{energyKind}, - + apply_arctic = #{applyArctic}, - + tack_time = #{tackTime}, tack_time = null, - + parts = #{parts}, - + items_name = #{itemsName}, - + items_num = #{itemsNum}, - + stand_id = #{standId}, - + MAINPOINTS_IMPEMENTATION = #{mainPointImplementation}, - + TERMS_CONDITIONS = #{termsConditions,jdbcType=CLOB}, - + fo = #{fo}, - + duty_engineer = #{dutyEngineer}, - + svpps = #{svpps}, - + claim_type = #{claimType}, - + bus_stand_cover = #{busStandCover}, @@ -329,7 +356,8 @@ + + @@ -492,7 +569,7 @@ @@ -524,39 +601,39 @@ update SAR_STAND_ITEMS - - + + svpps = #{item.svpps}, - + fo = #{item.fo}, - + file_type = #{item.fileType}, - + modify_time = #{item.modifyTime}, - + remarks = #{item.remarks}, - + apply_arctic = #{item.applyArctic}, - + items_name = #{item.itemsName}, - + items_num = #{item.itemsNum}, - + stand_id = #{item.standId}, - + TERMS_CONDITIONS = #{item.termsConditions,jdbcType=CLOB}, - where id = #{item.id, jdbcType=VARCHAR} + where id = #{item.id, jdbcType=VARCHAR} ; @@ -595,7 +672,6 @@ - - select stand_id as label,claim_type as value from SAR_STAND_ITEMS where valid_flag = 0 and claim_type != '' @@ -627,7 +704,8 @@ - select stand_id as label,svpps as value from SAR_STAND_ITEMS where valid_flag = 0 and svpps != '' @@ -643,14 +721,16 @@ + + SELECT + count(sar_stand_project_library.id ) as total + FROM + sar_stand_project_library + LEFT JOIN ts_user tu ON project_manager = tu.USID + WHERE + ( + id NOT IN ( SELECT project_id FROM sar_stand_project_relation ) + + + AND project_number LIKE concat(concat('%',#{qu.projectNumber}),'%') + + + AND project_name LIKE concat(concat('%',#{qu.projectName}),'%') + + + AND project_classification LIKE concat(concat('%',#{qu.projectClassification}),'%') + + + AND project_platfor LIKE concat(concat('%',#{qu.projectPlatfor}),'%') + + + AND project_group LIKE concat(concat('%',#{qu.projectGroup}),'%') + + + AND project_status LIKE concat(concat('%',#{qu.projectStatus}),'%') + + + AND current_node LIKE concat(concat('%',#{qu.currentNode}),'%') + + + AND project_level LIKE concat(concat('%',#{qu.projectLevel}),'%') + + + AND project_manager LIKE concat(concat('%',#{qu.projectManager}),'%') + + + AND product_line LIKE concat(concat('%',#{qu.productLine}),'%') + + + AND project_start_date >= #{qu.projectStartDate} + + + AND project_end_date <= #{qu.projectEndDate} + + + ) + + + From 7a51e1d9b4fadd519689cdb6977fa85aef471a9b Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Mon, 9 Aug 2021 16:56:29 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=AF=A6=E6=83=85->?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=88=86=E8=A7=A3=E5=8D=95=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=20mapper=E5=AD=97=E7=AC=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/mapper/SarStandItems/SarStandItemsMapper.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml index 774efa4c..47d36212 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml @@ -384,7 +384,6 @@ sar_stand_items AS a LEFT JOIN sar_interpretation_national_standard AS b ON a.STAND_ID = b.STAND_ID --- valid_flag=0 and a.stand_id=#{standId} @@ -397,7 +396,7 @@ and a.ITEMS_NAME=#{itemsName} - + and a.XCXSSRQ=#{XCXSSRQ}