Merge remote-tracking branch 'origin/develop_master' into develop_master

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/service/ISarBussStandAttrInfoService.java

@@ -16,6 +16,10 @@ import java.util.List;
  */
 public interface ISarBussStandAttrInfoService extends IService<SarBussStandAttrInfo> {
 
+    String selectFieldValByStandId(String field,String standId);
+
+    int updateStandInfo(String standId,String field,String value);
+
     List<SarBussStandAttrInfo> queryByList(SarBussStandAttrInfoEOPage page);
 
     List<SarBussStandAttrInfo> queryByPage(SarBussStandAttrInfoEOPage page);

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/service/impl/SarBussStandAttrInfoServiceImpl.java

@@ -20,6 +20,16 @@ import java.util.List;
 @Service
 public class SarBussStandAttrInfoServiceImpl extends ServiceImpl<SarBussStandAttrInfoDao, SarBussStandAttrInfo> implements ISarBussStandAttrInfoService {
 
+    @Override
+    public int updateStandInfo(String standId,String field,String value){
+        return this.baseMapper.updateStandInfo(standId,field,value);
+    }
+
+    @Override
+    public String selectFieldValByStandId (String field,String standId) {
+        return this.baseMapper.selectFieldValByStandId(field,standId);
+    }
+
     @Override
     public List<SarBussStandAttrInfo> queryByList(SarBussStandAttrInfoEOPage page){
         return this.baseMapper.queryByList(page);

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java

@@ -56,6 +56,7 @@ public class SarBussionessStand extends BaseEntity {
 
     @ApiModelProperty(value = "发布日期")
     @TableField("ISSUE_TIME")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     private String issueTime;
 
     @ApiModelProperty(value = "实施日期")
@@ -130,6 +131,9 @@ public class SarBussionessStand extends BaseEntity {
     @TableField(exist = false)
     private String putTimeStr;
 
+    @TableField(exist = false)
+    private String processNum;//流程编号
+
     //目录ID   非标准信息表中的字段
     @TableField(exist = false)
     private String  menuId;

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java

@@ -18,6 +18,8 @@ import java.util.List;
  */
 public interface ISarBussionessStandService extends IService<SarBussionessStand> {
 
+    void attrInfoDetails (SarBussionessStand row) throws Exception;
+
     ResponseMessage<SarBussionessStand> deleteSarBussionessStand(SarBussionessStandEOPage page) throws Exception;
 
     List<SarBussionessStand> getSarBussionessStand(String exportType, String exportContent,String userId) throws Exception;