FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: There is no way the, bug #55745 #55786 #55815

Browse Source
This commit is contained in:
396572590@qq.com
2022-06-22 18:11:11 +08:00
parent d53d7d9d85
commit 5d8dcb23eb
8 changed files with 55 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java
+2 -2
View File
@@ -83,8 +83,8 @@ public class SarBussionessStandController extends BaseController<SarBussionessSt
@ApiOperation(value = "|SarBussionessStandEO|根据计划库制定状态查询企标编号")
@GetMapping("/getStandInfoByReviseStatus")
//@RequiresPermissions("lawss:sarStandardsInfo:get")
public ResponseMessage<SarBussionessStand> getStandInfoByReviseStatus(String reviseStatus) {
SarBussionessStand result = sarBussionessStandEOService.getStandInfoByReviseStatus(reviseStatus);
public ResponseMessage<SarBussionessStand> getStandInfoByReviseStatus(String reviseStatus,String standSort) {
SarBussionessStand result = sarBussionessStandEOService.getStandInfoByReviseStatus(reviseStatus,standSort);
return Result.success(result);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java
+1 -1
View File
@@ -38,7 +38,7 @@ public interface SarBussionessStandDao extends BaseMapper<SarBussionessStand> {
List<SarBussionessStand> queryByBussStateSync(SarBussionessStand sarBussionessStand);
SarBussionessStand getStandInfoByReviseStatus(String reviseStatus);
SarBussionessStand getStandInfoByReviseStatus(String reviseStatus,String standSort);
SarBussionessStand selectByPrimaryKey(String standId);
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java
+1 -1
View File
@@ -19,7 +19,7 @@ import java.util.List;
*/
public interface ISarBussionessStandService extends IService<SarBussionessStand> {
SarBussionessStand getStandInfoByReviseStatus(String reviseStatus);
SarBussionessStand getStandInfoByReviseStatus(String reviseStatus,String standSort);
void attrInfoDetails (SarBussionessStand row) throws Exception;
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+2 -2
View File
@@ -162,8 +162,8 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
private INewsFeedService iNewsFeedService;
@Override
public SarBussionessStand getStandInfoByReviseStatus(String reviseStatus){
return sarBussionessStandEODao.getStandInfoByReviseStatus(reviseStatus);
public SarBussionessStand getStandInfoByReviseStatus(String reviseStatus,String standSort){
return sarBussionessStandEODao.getStandInfoByReviseStatus(reviseStatus,standSort);
}
public ResponseMessage<SarBussionessStand> deleteSarBussionessStand(SarBussionessStandEOPage page) throws Exception {
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java
+10
View File
@@ -16,6 +16,8 @@ public class SarBussionessStandEOPage extends BasePage {
private String textStatusBuss;
private String reviseStatus;
public String getTextStatusBuss() {
return textStatusBuss;
}
@@ -176,6 +178,14 @@ public class SarBussionessStandEOPage extends BasePage {
private String syncParam;
public String getReviseStatus() {
return reviseStatus;
}
public void setReviseStatus(String reviseStatus) {
this.reviseStatus = reviseStatus;
}
public String getSyncParam() {
return syncParam;
}
adc-da-slrs/src/main/java/com/adc/da/utils/util/BussStandExportUtil.java
+29 -1
View File
@@ -106,6 +106,9 @@ public class BussStandExportUtil {
case "文本状态":
value = verifyBean(sarStandardsInfoEO.getStandStatusShow());
break;
case "企标制修订状态":
value = verifyBean(sarStandardsInfoEO.getReviseStatus());
break;
case "企标实施日期":
String putTime="";
if(sarStandardsInfoEO.getPutTime() != null){
@@ -160,7 +163,32 @@ public class BussStandExportUtil {
private static String verifyBean(String value){
String val = "";
if(StringUtils.isNotBlank(value)){
val =value;
if(value.contains("buss1_")){
if("buss1_1".equals(value)){
val = "制定";
}else if("buss1_2".equals(value)){
val = "修订";
}else {
val = "";
}
}else if(value.contains("buss2_")){
switch (value) {
case "buss2_1":
val = "制定";
break;
case "buss2_2":
val = "修订";
break;
case "buss2_3":
val = "修改";
break;
default:
val = "";
break;
}
}else {
val =value;
}
}else {
val = "";
}
adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java
+1 -1
View File
@@ -54,7 +54,7 @@ public class FieldConvertUtil {
"个性化标签,政策文本,过程稿件,新车型实施日期（文本）,在产车实施日期（文本）,EOP实施日期（文本）,SVPPS," +
"相关部门,责任部门,FO,维护工程师,归口管理部门,发布机构,我司是否参与,相关资料";
public static String exportBaseFieldNamesBuss = "企标编号,中文名称,英文名称,文本状态,发布日期,企标实施日期";
public static String exportBaseFieldNamesBuss = "企标编号,中文名称,英文名称,文本状态,发布日期,企标实施日期,企标制修订状态";
public static String exportAttrFieldNamesBuss = "SVPPS,规范性引用文件,废止日期,复审日期,密级,授权,相关部门," +
"需会签部门,起草部门,主要起草人,起草分标委,企标文本,过程文本";
adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml
+9 -7
View File
@@ -52,7 +52,7 @@
SAR_BUSSIONESS_STAND.creation_time, SAR_BUSSIONESS_STAND.valid_flag,
SAR_BUSSIONESS_STAND.apply_country, SAR_BUSSIONESS_STAND.stand_nature,SAR_BUSSIONESS_STAND.stand_sort,SAR_BUSSIONESS_STAND.stand_year,
stand_status, replaced_stand_num,replace_stand_num,put_time,issue_time,stand_en_name,
stand_name, stand_code,SAR_BUSSIONESS_STAND.id,SAR_BUSSIONESS_STAND.text_status_buss,SAR_BUSSIONESS_STAND.stand_number
stand_name, stand_code,SAR_BUSSIONESS_STAND.id,SAR_BUSSIONESS_STAND.text_status_buss,SAR_BUSSIONESS_STAND.stand_number,SAR_BUSSIONESS_STAND.revise_status
</sql>
<sql id="Base_Column_List_show_Export" >
@@ -61,7 +61,7 @@
SAR_BUSSIONESS_STAND.apply_country, SAR_BUSSIONESS_STAND.stand_nature,SAR_BUSSIONESS_STAND.stand_sort,SAR_BUSSIONESS_STAND.stand_year,
stand_status, replaced_stand_num,replace_stand_num,put_time,issue_time,stand_en_name,
stand_name, stand_code,SAR_BUSSIONESS_STAND.text_status_buss,SAR_BUSSIONESS_STAND.stand_number,
dicstandTextStatus.DIC_TYPE_NAME AS standStatusShow
dicstandTextStatus.DIC_TYPE_NAME AS standStatusShow,SAR_BUSSIONESS_STAND.revise_status
</sql>
<sql id="Base_Column_List_show_ExportResult" >
@@ -70,12 +70,12 @@
tmp_tb.apply_country, tmp_tb.stand_nature,tmp_tb.stand_sort,tmp_tb.stand_year,
tmp_tb.stand_status, tmp_tb.replaced_stand_num,tmp_tb.replace_stand_num,tmp_tb.put_time,tmp_tb.issue_time,tmp_tb.stand_en_name,
tmp_tb.stand_name, tmp_tb.stand_code,tmp_tb.text_status_buss,tmp_tb.stand_number,
tmp_tb.standStatusShow
tmp_tb.standStatusShow,tmp_tb.revise_status
</sql>
<sql id="Group_Column_List_show" >
stand_status, replaced_stand_num, replace_stand_num,put_time,
issue_time, stand_en_name, stand_name, stand_code,stand_status,
issue_time, stand_en_name, stand_name, stand_code,stand_status,revise_status,
SAR_BUSSIONESS_STAND.id, SAR_BUSS_STAND_ATTR_INFO.DTQBBHBUSS
</sql>
@@ -347,9 +347,8 @@
</select>
<select id="getStandInfoByReviseStatus" resultMap="BaseResultMap" parameterType="java.lang.String">
select LPAD(MAX(DISTINCT CAST(STAND_SN AS decimal(9)))+1, 4, 0) AS newStandSn from sar_bussioness_stand
where revise_status = #{value} and valid_flag=0
select MAX(DISTINCT CAST(STAND_SN AS decimal(9)))+1 AS newStandSn from sar_bussioness_stand
where revise_status = #{value} and REPLACE(STAND_SORT,' ','') = REPLACE(#{standSort},' ','') and valid_flag=0
</select>
<!-- 删除记录 -->
@@ -488,6 +487,9 @@
<if test="textStatusBuss!=null">
and text_status_buss=#{textStatusBuss}
</if>
<if test="reviseStatus!=null and reviseStatus != ''">
and revise_status=#{reviseStatus}
</if>
<if test='syncParam != null and syncParam == "sync"'>
and SAR_BUSSIONESS_STAND.MODIFY_TIME between DATE_SUB(NOW(),INTERVAL 7 day) and DATE_SUB(NOW(),INTERVAL -1 day)