11

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

@@ -28,7 +28,7 @@ public interface AuditApiService {
 
 	void insert(AuditDTO audit);
 
-	Page<AuditDTO> listByStaffId(String staffId, BasePageInfo pageInfo);
+	Page<AuditDTO> listByStaffId(String staffId,Integer auditType,Integer auditStatus, BasePageInfo pageInfo);
 
 	Page<AuditDTO> pageStoreListByParams(String storeId, BasePageInfo pageInfo, Integer auditType, Integer auditStatus);
 	

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabHaobanAuditMapper.java

@@ -29,7 +29,7 @@ public interface TabHaobanAuditMapper {
     
     TabHaobanAudit findByStoreIdAndChangeField(@Param("storeId")String storeId,@Param("changeField")String changeField);
 
-	com.github.pagehelper.Page listByStaffId(@Param("staffId")String staffId);
+	com.github.pagehelper.Page listByStaffId(@Param("staffId")String staffId,@Param("auditType")Integer auditType,@Param("auditStatus")Integer auditStatus);
 
 	com.github.pagehelper.Page pageStoreListByParams(@Param("storeId")String storeId, @Param("auditType")Integer auditType, @Param("auditStatus")Integer auditStatus);
 }
\ No newline at end of file

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

@@ -403,9 +403,9 @@ public class AuditApiServiceImpl implements AuditApiService{
 		auditMapper.insertSelective(EntityUtil.changeEntityByJSON(TabHaobanAudit.class, audit));
 	}
 	@Override
-	public Page<AuditDTO> listByStaffId(String staffId, BasePageInfo pageInfo) {
+	public Page<AuditDTO> listByStaffId(String staffId, Integer auditType,Integer auditStatus,BasePageInfo pageInfo) {
 		PageHelper.startPage(pageInfo.getPageNum(), pageInfo.getPageSize());
-		return PageUtil.changePageHelperToCurrentPage(auditMapper.listByStaffId(staffId),AuditDTO.class);
+		return PageUtil.changePageHelperToCurrentPage(auditMapper.listByStaffId(staffId,auditType,auditStatus),AuditDTO.class);
 	}
 	@Override
 	public Page<AuditDTO> pageStoreListByParams(String storeId, BasePageInfo pageInfo, Integer auditType,

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

@@ -362,7 +362,15 @@
 	    where 1=1
 			and commit_staff_id = #{staffId,jdbcType=VARCHAR}
 			and status_flag = 1
-			and audit_type in (2,3,4,5)
+			<if test="auditType == null">
+				and audit_type in (2,3,4,5)
+			</if>
+			<if test="auditType != null">
+				and audit_type  = #{auditType}
+			</if>
+			<if test="auditStatus != null">
+				and audit_status = #{auditStatus}
+			</if>
 			order by create_time desc
 	</select>
 	

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

@@ -48,12 +48,12 @@ public class AuditController extends WebBaseController{
 	private SyncHaobanToGicServiceApi syncHaobanToGicServiceApi;
 	
 	@RequestMapping("clerk-apply-list")
-	public HaobanResponse staffStoreList(String staffId,String wxEnterpriseId,BasePageInfo pageInfo){
+	public HaobanResponse staffStoreList(String staffId,Integer auditType,Integer auditStatus,String wxEnterpriseId,BasePageInfo pageInfo){
 		if(StringUtils.isAnyBlank(staffId,wxEnterpriseId)){
 			return resultResponse(HaoBanErrCode.ERR_2);
 		}
 		
-		Page<AuditDTO> page = auditApiService.listByStaffId(staffId,pageInfo);
+		Page<AuditDTO> page = auditApiService.listByStaffId(staffId,auditType,auditStatus,pageInfo);
 		List<AuditDTO> list = page.getResult();
 		List<AuditVO> voList = new ArrayList<AuditVO>();
 		for (AuditDTO auditDTO : list) {

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

@@ -607,7 +607,7 @@ public class ClerkController extends WebBaseController{
 		audit.setOldValue(json.toJSONString());
 		audit.setCommitTime(new Date());
 		audit.setAuditName(staff.getStaffName());
-		audit.setAuditType(2);
+		audit.setAuditType(5);
 		auditApiService.insert(audit);
 		
 		staffClerkRelationApiService.delByStoreIdAndCode(storeId, clerkCode);

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/AuditVO.java

@@ -9,7 +9,7 @@ public class AuditVO implements Serializable{
 	
 	private String auditReason;
 	
-	private Integer applyStatus;
+	private Integer auditStatus;
 	
 	private Date commitTime;
 	
@@ -50,12 +50,13 @@ public class AuditVO implements Serializable{
 		this.auditReason = auditReason;
 	}
 
-	public Integer getApplyStatus() {
-		return applyStatus;
+
+	public Integer getAuditStatus() {
+		return auditStatus;
 	}
 
-	public void setApplyStatus(Integer applyStatus) {
-		this.applyStatus = applyStatus;
+	public void setAuditStatus(Integer auditStatus) {
+		this.auditStatus = auditStatus;
 	}
 
 	public Date getCommitTime() {