Merge branch 'dev' of http://101.36.160.140:21044/depot-qinghai/depot-system-qinghai into dev

src/main/java/com/chinaitop/depot/sqr/controller/BizSqrEnterpriseApplyController.java

@@ -126,9 +126,10 @@ public class BizSqrEnterpriseApplyController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "enterpriseApplyId", value = "申请记录唯一标识符", paramType = "form")
     })
-    public Map<String, Object> remove(Integer applyType,String unitInfoId,Integer enterpriseApplyId) throws JsonParseException, JsonMappingException, IOException {
+    public Map<String, Object> remove(Integer enterpriseApplyId){
         Map<String, Object> modelMap = new HashMap<>();
         if (enterpriseApplyId != null) {
+        	bizGrQeApplyService.deleteById(enterpriseApplyId);
         }
         modelMap.put("status", "success");
         return modelMap;

src/main/java/com/chinaitop/depot/sqr/mapper/BizSqrEnterpriseApplyMapper.xml

@@ -103,6 +103,8 @@
         <if test="dwmc != null and dwmc != ''">
             and bui.dwmc LIKE concat('%', #{dwmc}, '%')
         </if>
+        ORDER BY bgqa.id desc
+        
 
     </select>
     <select id="findById" resultType="Map" resultMap="BaseResultMap">

src/main/java/com/chinaitop/depot/sqr/service/BizSqrEnterpriseApplyService.java

@@ -51,4 +51,7 @@ public interface BizSqrEnterpriseApplyService {
     public Map<String, Object> saveOrUpdate(HttpServletRequest request, String bizSqrEnterpriseApplyJson, String userInfo) throws Exception;
 
     void remove(Integer applyType,String unitInfoId,Integer enterpriseApplyId);
+
+
+	void deleteById(Integer enterpriseApplyId);
 }

src/main/java/com/chinaitop/depot/sqr/service/impl/BizSqrEnterpriseApplyServiceImpl.java

@@ -276,4 +276,10 @@ public class BizSqrEnterpriseApplyServiceImpl implements BizSqrEnterpriseApplySe
         auditRecord.setUpdateTime(new Date());
         auditRecordService.insert(auditRecord);
     }
+
+	@Override
+	public void deleteById(Integer enterpriseApplyId) {
+		// TODO Auto-generated method stub
+		bizSqrEnterpriseApplyMapper.delete(enterpriseApplyId);
+	}
 }