From e8d901bb2f9d85b6786eec643b6a0a7f54433cd8 Mon Sep 17 00:00:00 2001 From: "Mr.Z" <709235321@qq.com> Date: Thu, 16 Sep 2021 20:11:23 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E5=88=86=E8=A7=A3=E5=8D=95=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E9=97=AE=E9=A2=98~?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/mapper/SarStandItems/SarStandItemsMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 64aa146f..0511cc75 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 @@ -416,7 +416,7 @@ order by ${orderBy} ${order} - LIMIT #{page},#{pageSize} + LIMIT ${page-1},#{pageSize} From 2b9b039a48b5a7804acfdc612ea68a5943918e40 Mon Sep 17 00:00:00 2001 From: "Mr.Z" <709235321@qq.com> Date: Wed, 22 Sep 2021 16:52:13 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E6=8B=89=E5=8F=96master?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarStandItemsServiceImpl.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) 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 f534cf75..4cc9288f 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 @@ -225,10 +225,6 @@ public class SarStandItemsServiceImpl extends ServiceImpl querySarItemAndInterpretation(FindSarItemsPageReqDTO page){ - //分页查询的总数 - Integer count=dao.sarItemCount(page); - page.getPager().setRowCount(count); - //排序 if (page.getOrderBy()!=null && page.getOrder()!=null){ @@ -246,7 +242,9 @@ public class SarStandItemsServiceImpl extends ServiceImpl sarStandItems = dao.querySarItemAndInterpretation(page); return sarStandItems; } From c7e3c97339581c02289e8f1df9342b89cc380b53 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Thu, 23 Sep 2021 15:17:41 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E5=9B=BD=E5=86=85=E5=A4=96=E6=A0=87?= =?UTF-8?q?=E5=87=86--=E5=A6=82=E6=9E=9C=E6=B8=85=E5=8D=95=E4=B8=8B?= =?UTF-8?q?=E6=8C=82=E7=9D=80=E6=A0=87=E5=87=86A=EF=BC=8C=E5=9C=A8?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=BA=93=E9=87=8C=E5=88=A0=E9=99=A4=E6=A0=87?= =?UTF-8?q?=E5=87=86A=E7=9A=84=E8=AF=9D=EF=BC=8C=E5=8A=A0=E4=B8=AA?= =?UTF-8?q?=E9=AA=8C=E8=AF=81=20=E4=B8=8D=E8=AE=A9=E5=88=A0=E8=BF=99?= =?UTF-8?q?=E4=B8=AA=E6=A0=87=E5=87=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarStandardsInfoController.java | 5 ++++- .../impl/SarStandardsInfoServiceImpl.java | 21 +++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java index 06bf3717..18fc22cd 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java @@ -218,7 +218,10 @@ public class SarStandardsInfoController extends BaseController int result = sarStandardsInfoEOService.deleteSarStandards(ids); if (result > 0) { return Result.success("0", "删除成功", result); - } else { + }else if(result == -1) { + return Result.success("-1","所选的标准下挂有标准，无法删除"); + } + else { return Result.error("删除失败"); } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index 5b3dc546..e9af7d73 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -15,6 +15,8 @@ import com.adc.da.search.entity.StandLawsEO; import com.adc.da.search.service.StandLawsSearchService; import com.adc.da.slrs.otConvertMq.dao.OtConvertMqDao; import com.adc.da.slrs.otConvertMq.entity.OtConvertMq; +import com.adc.da.slrs.sarLawsAttrDetailedList.entity.SarLawsAttrDetailedList; +import com.adc.da.slrs.sarLawsAttrDetailedList.service.impl.SarLawsAttrDetailedListServiceImpl; import com.adc.da.slrs.sarLawsInfo.entity.SarLawsInfo; import com.adc.da.slrs.sarLawsInfo.page.SarLawsInfoEOPage; import com.adc.da.slrs.sarLawsInfo.page.SarLawsItemsEOPage; @@ -1285,13 +1287,32 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl detailedListQueryWrapper = new QueryWrapper<>(); + + String[] idArr = ids.split(","); SarStandardsInfo sarStandardsInfoEO = new SarStandardsInfo(); sarStandardsInfoEO.setValidFlag("1"); sarStandardsInfoEO.setModifyTime(new Date()); int countResult = 0; + //如果清单下挂着标准A，在标准库里删除标准A的话，加个验证 不让删这个标准 + for (String id : idArr){ + detailedListQueryWrapper.eq("stand_id",id); + + int count = detailedListService.count(detailedListQueryWrapper); + if (count>0){ + countResult = -1; + return countResult; + } + + } + for (String id : idArr) { + countResult++; //查询删除的标准信息（为删除代替关系） SarStandardsInfo getDelStandInfoList = dao.selectById(id); From 30c2b5de44847035b06a564bd525bd8d0ed574d1 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Sun, 26 Sep 2021 10:34:07 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E6=9C=BA=E6=9E=84=E7=AE=A1=E7=90=86=20=E8=BE=93=E5=85=A5?= =?UTF-8?q?=E6=A3=80=E7=B4=A2=E6=9D=A1=E4=BB=B6=20=E6=9F=A5=E8=AF=A2=20?= =?UTF-8?q?=E6=9C=8912=E6=9D=A1=20=E4=BD=86=E6=98=AF=E6=98=BE=E7=A4=BA25?= =?UTF-8?q?=E6=9D=A1=2025=E6=9D=A1=E6=98=AF=E6=89=80=E6=9C=89=E7=9A=84?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java | 2 +- .../main/resources/mybatis/mapper/sarUser/TsUserMapper.xml | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java index 900ec013..d23b2b4b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java @@ -70,7 +70,7 @@ public class TsUserServiceImpl extends ServiceImpl implements Page tsUserPage = new Page<>(); System.out.println(tsUser.getCurrent()); System.out.println(tsUser.getSize()); - List tsUserList = tsUserDao.getUserAndPositionPage((tsUser.getCurrent()-1)*tsUser.getSize(),1*tsUser.getSize(),tsUser); + List tsUserList = tsUserDao.getUserAndPositionPage((tsUser.getCurrent()-1)*tsUser.getSize(),tsUser.getSize(),tsUser); Integer total = tsUserDao.getUserAndPositionCount(tsUser); tsUserPage.setRecords(tsUserList); tsUserPage.setCurrent(tsUser.getCurrent()); diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml index 6c5a5869..5346819e 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml @@ -51,6 +51,12 @@ left join ts_position p on up.position_id=p.id where u.institution_id=#{TsUser.institutionId} + + and u.uname like concat('%',#{TsUser.uname},'%') + + + and u.email like concat('%',#{TsUser.email},'%') + - select ID,STAND_ID,ITEMS_NUM,ITEMS_NAME,RESPONSIBLE_UNIT,SVPPS,APPLY_ARCTIC,CLAIM_TYPE,BUS_STAND_COVER,DUTY_ENGINEER as responsibleEngineer,XCXSSRQ as xcxssrq,ZCCSSRQ as zccssrq + select ID,STAND_ID,ITEMS_NUM,ITEMS_NAME,TERMS_CONDITIONS as termsConditions,RESPONSIBLE_UNIT,SVPPS,APPLY_ARCTIC,CLAIM_TYPE,BUS_STAND_COVER,DUTY_ENGINEER as responsibleEngineer,XCXSSRQ as xcxssrq,ZCCSSRQ as zccssrq from SAR_STAND_ITEMS where FILE_TYPE=#{type} From 04a07687c6866a5e0bb45f769d9453b2b33217aa Mon Sep 17 00:00:00 2001 From: "Mr.Z" <709235321@qq.com> Date: Mon, 27 Sep 2021 17:11:07 +0800 Subject: [PATCH 11/12] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml index 661b3184..859f692d 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml @@ -408,6 +408,9 @@ and stand_name like concat(concat('%',#{standName}),'%') + or STAND_NUMBER like concat(concat('%',#{standName}),'%') + or STAND_YEAR like concat(concat('%',#{standName}),'%') + or STAND_SORT like concat(concat('%',#{standName}),'%') and stand_en_name like concat(concat('%',#{standEnName}),'%') From 4584b06a4205acda5ef1f77d34c590bd7d466547 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Mon, 27 Sep 2021 17:26:48 +0800 Subject: [PATCH 12/12] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E6=95=B4=E6=94=B9-=E5=AF=BC=E5=87=BA=20=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=9C=89=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/SarStandUnqualified.java | 53 ++++++++++--------- 1 file changed, 29 insertions(+), 24 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java index 9f5e772e..c4e954cb 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java @@ -36,7 +36,12 @@ public class SarStandUnqualified extends BaseEntity { private static final long serialVersionUID = 1L; - @ExcelProperty("标准ID") + @ExcelProperty("标准号") + @ApiModelProperty(value = "标准编号") + @TableField("STAND_SERIAL_NUMBER") + private String standSerialNumber; + + @ExcelIgnore @ApiModelProperty(value = "标准ID") @TableField("STAND_ID") private String standId; @@ -69,27 +74,27 @@ public class SarStandUnqualified extends BaseEntity { @TableField("ITEMS_NAME") private String itemsName; + @ExcelProperty(value = "产品类型",converter = ProductTypeConverter.class) + @ApiModelProperty(value = "产品类型（research为在研产品，product为在产产品）") + @TableField("PRODUCT_TYPE") + private String productType; + @ExcelProperty("产品线") @ApiModelProperty(value = "产品线") @TableField("PRODUCT_LINE") private String productLine; - @ExcelProperty("责任部门") - @ApiModelProperty(value = "责任部门") - @TableField("RESPONSIBLE_UNIT") - private String responsibleUnit; - @ExcelProperty("项目名称") @ApiModelProperty(value = "项目名称") @TableField("PRODUCT_NAME") private String productName; - @ExcelProperty("创建部门") + @ExcelIgnore @ApiModelProperty(value = "创建部门") @TableField("CREATE_DEPT_ID") private String createDeptId; - @ExcelProperty("创建人") + @ExcelIgnore @ApiModelProperty(value = "创建人") @TableField("CREATE_BY_ID") private String createById; @@ -113,17 +118,16 @@ public class SarStandUnqualified extends BaseEntity { @TableField("ACTUAL_CLOSE_TIME") private Date actualCloseTime; - @ExcelIgnore - @ApiModelProperty(value = "计划关闭时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @TableField("PLAN_CLOSE_TIME") - private Date planCloseTime; - + @ExcelProperty("不合规项目") @ApiModelProperty(value = "未符合原因") @TableField("REASON") private String reason; + @ExcelProperty("责任部门") + @ApiModelProperty(value = "责任部门") + @TableField("RESPONSIBLE_UNIT") + private String responsibleUnit; + @ExcelProperty("质量工程师") @ApiModelProperty(value = "质量工程师") @TableField("QA_ENGINEER") @@ -139,33 +143,34 @@ public class SarStandUnqualified extends BaseEntity { @TableField("DUTY_ENGINEER") private String dutyEngineer; - @ExcelProperty("标准编号") - @ApiModelProperty(value = "标准编号") - @TableField("STAND_SERIAL_NUMBER") - private String standSerialNumber; - - @ExcelProperty(value = "产品类型",converter = ProductTypeConverter.class) - @ApiModelProperty(value = "产品类型（research为在研产品，product为在产产品）") - @TableField("PRODUCT_TYPE") - private String productType; + @ExcelProperty("计划关闭时间") + @ApiModelProperty(value = "计划关闭时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @TableField("PLAN_CLOSE_TIME") + private Date planCloseTime; @ExcelIgnore @ApiModelProperty(value = "主键") @TableId(type = IdType.UUID) private String id; + @ExcelIgnore @ApiModelProperty(value = "质量工程师") @TableField(exist=false) private String qaEngineerName; + @ExcelIgnore @ApiModelProperty(value = "认证工程师") @TableField(exist=false) private String authEngineerName; + @ExcelIgnore @ApiModelProperty(value = "责任工程师") @TableField(exist=false) private String dutyEngineerName; + @ExcelIgnore @ApiModelProperty(value = "国内OR海外") @TableField(exist=false) private String standType;