111

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/AuditApiService.java

@@ -14,9 +14,9 @@ public interface AuditApiService {
 	
 	Page<AuditDTO> page(Integer auditType, String search,String wxEnterpriseId,String enterpriseId,Integer auditStatus,Integer auditFlag,BasePageInfo pageInfo);
 	
-	void audit(String auditId);
+	void audit(String auditId,String aduitName);
 	
-	void refuse(String auditId,String auditReason);
+	void refuse(String auditId,String auditReason,String aduitName);
 	
 	int save(Integer auditType,String wxEnterpriseId,String enterpriseId,String commitStaffId,String commitStoreId,String changeField,String oldValue,String newValue);
 	

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/AuditApiServiceImpl.java

@@ -74,7 +74,7 @@ public class AuditApiServiceImpl implements AuditApiService{
 	}
 	@Transactional
 	@Override
-	public void audit(String auditId) {
+	public void audit(String auditId,String auditName) {
 		TabHaobanAudit tab = auditMapper.selectByPrimaryKey(auditId);
 		if(tab==null){
 			return;
@@ -82,6 +82,7 @@ public class AuditApiServiceImpl implements AuditApiService{
 		tab.setAuditId(auditId);
 		tab.setAuditStatus(1);
 		tab.setUpdateTime(new Date());
+		tab.setAuditName(auditName);
 		auditMapper.updateByPrimaryKeySelective(tab);	
 		String storeId = tab.getCommitStoreId();
 		String oldValue = tab.getOldValue();
@@ -90,12 +91,13 @@ public class AuditApiServiceImpl implements AuditApiService{
 		this.editStoreInfo(storeId, changeField, oldValue, newValue);
 	}
 	@Override
-	public void refuse(String auditId, String auditReason) {
+	public void refuse(String auditId, String auditReason,String auditName) {
 		TabHaobanAudit tab = new TabHaobanAudit();
 		tab.setAuditId(auditId);
 		tab.setAuditStatus(2);
 		tab.setUpdateTime(new Date());
 		tab.setAuditReason(auditReason);
+		tab.setAuditName(auditName);
 		auditMapper.updateByPrimaryKeySelective(tab);			
 	}
 	@Override

haoban-manage3-service/src/main/resources/mapper/TabHaobanAuditMapper.xml

@@ -297,6 +297,7 @@
 			 </if>
    	   	    <include refid="storeSql"/>
    	   	    <include refid="staffSql"/>
+   	   	order by   commit_time desc
   	</select>
   	
   	<select id="listByStoreId" resultMap="BaseResultMap"  >

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/AuditController.java

@@ -149,21 +149,21 @@ public class AuditController extends WebBaseController{
 	//审核拒绝
 	@HttpLimit
 	@RequestMapping("refuse")
-	public HaobanResponse refuse(String auditId,String auditReason ) {
-		if(StringUtils.isAnyBlank(auditId,auditReason)){
+	public HaobanResponse refuse(String auditId,String auditReason ,String auditName) {
+		if(StringUtils.isAnyBlank(auditId,auditReason,auditName)){
 			return resultResponse(HaoBanErrCode.ERR_2);
 		}
-		auditApiService.refuse(auditId, auditReason);
+		auditApiService.refuse(auditId, auditReason,auditName);
 		return resultResponse(HaoBanErrCode.ERR_1);
 	}
 	//审核同意
 	@HttpLimit
 	@RequestMapping("audit")
-	public HaobanResponse audit(String auditId ) {
+	public HaobanResponse audit(String auditId,String auditName ) {
 		if(StringUtils.isAnyBlank(auditId)){
 			return resultResponse(HaoBanErrCode.ERR_2);
 		}
-		auditApiService.audit(auditId);
+		auditApiService.audit(auditId,auditName);
 		return resultResponse(HaoBanErrCode.ERR_1);
 	}
 }