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 7a3136fc..bda086a6 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,9 +5,7 @@ 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.adc.da.util.UUIDUtils; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -15,7 +13,6 @@ 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; @@ -55,6 +52,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 65be9704..c24cf7e2 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 @@ -189,4 +189,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 eb3ce0d5..8fba8599 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,7 +185,7 @@ #{item} - + and (SAR_STAND_ITEMS.claim_type='L7N7EEDAPR' or SAR_STAND_ITEMS.claim_type='RENVECPFGT') @@ -178,66 +201,66 @@ - + 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 +281,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 +352,8 @@ + + @@ -492,7 +564,7 @@ @@ -524,39 +596,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 +667,6 @@ - - select stand_id as label,claim_type as value from SAR_STAND_ITEMS where valid_flag = 0 and claim_type != '' @@ -627,7 +699,8 @@ - select stand_id as label,svpps as value from SAR_STAND_ITEMS where valid_flag = 0 and svpps != '' @@ -643,14 +716,16 @@