修改

src/main/java/com/jeeplus/modules/sg/financial/erpcredit/service/ErpCreditService.java

@@ -96,7 +96,6 @@ public class ErpCreditService extends CrudService<ErpCreditMapper,ErpCredit> {
         List<ErpCreditEquipment> equSures = ErpInfo.getEquNumbers(eqmList);//特殊情况处理   物料信息
         erpCredit.setErpCreditChild1s(equSures);
         erpCredit.setErpCreditChild2s(erpCreditMaterialMapper.findList(new ErpCreditMaterial(erpCredit)));
-//        erpCredit.setErpCreditChild3s(erpCreditChild3Mapper.findList(new ErpCreditChild3(erpCredit)));
         return erpCredit;
     }
 
@@ -138,8 +137,7 @@ public class ErpCreditService extends CrudService<ErpCreditMapper,ErpCredit> {
     }
 
     @Transactional(readOnly = false)
-    public void save(ErpCredit erpCredit,String string) {
-        erpCredit.setStatus(string);
+    public void save(ErpCredit erpCredit) {
         super.save(erpCredit);
         for (ErpCreditEquipment erpCreditChild1 : erpCredit.getErpCreditChild1s()){
             if (ErpCreditEquipment.DEL_FLAG_NORMAL.equals(erpCredit.getDelFlag())){
@@ -176,7 +174,6 @@ public class ErpCreditService extends CrudService<ErpCreditMapper,ErpCredit> {
         super.delete(erpCredit);
         erpCreditEquipmentMapper.delete(new ErpCreditEquipment(erpCredit));
         erpCreditMaterialMapper.delete(new ErpCreditMaterial(erpCredit));
-//        erpCreditChild3Mapper.delete(new ErpCreditChild3(erpCredit));
     }
 
     @Transactional(readOnly = false)
@@ -193,12 +190,10 @@ public class ErpCreditService extends CrudService<ErpCreditMapper,ErpCredit> {
 
     //导出
     public void getExport(List<ErpCredit> erpCreditList, HttpServletResponse response){
-//        String[] strings = ids.split(",");
         List<String> strs = new ArrayList<String>();
         for (ErpCredit erpCredit1:erpCreditList){
             strs.add(erpCredit1.getItemId());
         }
-//        List<ErpCredit> erpCreditList = getListErpCredit(strs,status);
         List<MaintainData> maintainDatas = getFindListMain(strs);
         ExportTemplate exportTemplate = new ExportTemplate();
         File newFile = exportTemplate.createNewFile();
@@ -274,8 +269,6 @@ public class ErpCreditService extends CrudService<ErpCreditMapper,ErpCredit> {
                 e.printStackTrace();
             }
         }
-        // 删除创建的新文件
-        // this.deleteFile(newFile);
     }
 
     //验证：该预算数据

src/main/java/com/jeeplus/modules/sg/financial/erpcredit/web/ErpCreditController.java

@@ -87,17 +87,8 @@ public class ErpCreditController extends BaseController {
 	@RequiresPermissions("sg:financial:erpCredit:list")
 	@RequestMapping(value = "data")
 	public Map<String, Object> data(ErpCredit erpCredit, HttpServletRequest request, HttpServletResponse response, Model model) throws Exception{
-		HttpSession session = request.getSession();
-		String attribute = (String) session.getAttribute("erpStatus");
 		Page<ErpCredit> page = null;
-		if (attribute!=null){
-			erpCredit.setStatus(attribute);
-			page = erpCreditService.findPage(new Page<ErpCredit>(request, response), erpCredit);
-		}else {
-//			erpCredit.setId("123456");
-//			erpCredit.setStatus("0");
-			page = erpCreditService.findPage(new Page<ErpCredit>(request, response), erpCredit);
-		}
+		page = erpCreditService.findPage(new Page<ErpCredit>(request, response), erpCredit);
 		return getBootstrapData(page);
 	}
 
@@ -152,14 +143,6 @@ public class ErpCreditController extends BaseController {
 	@RequiresPermissions(value={"sg:financial:erpCredit:add","sg:financial:erpcredit:edit"},logical=Logical.OR)
 	@RequestMapping(value = "save")
 	public AjaxJson save(ErpCredit erpCredit, Model model,HttpServletRequest request, HttpServletResponse response) throws Exception{
-		HttpSession session = request.getSession();
-		String random = "";
-		random = (String) session.getAttribute("erpStatus");
-		if (random==null){
-			random = ErpInfo.getStatus();
-			request.getSession().setAttribute("erpStatus",random);
-		}
-		erpCredit.setStatus(random);
 		AjaxJson j = new AjaxJson();
 		/**
 		 * 后台hibernate-validation插件校验
@@ -171,7 +154,7 @@ public class ErpCreditController extends BaseController {
 			return j;
 		}
 		//新增或编辑表单保存
-		erpCreditService.save(erpCredit);//保存
+		erpCreditService.save(erpCredit);
 		j.setSuccess(true);
 		j.setMsg("保存表单成功");
 		return j;
@@ -213,9 +196,6 @@ public class ErpCreditController extends BaseController {
 	@RequiresPermissions("sg:financial:erpCredit:export")
 	@RequestMapping(value = "exportList")
 	public Result exportFileList(ErpCredit erpCredit,HttpServletRequest request, HttpServletResponse response){
-//		HttpSession session = request.getSession();
-//		String attribute = (String) session.getAttribute("erpStatus");
-//		erpCredit.setStatus(attribute);
 		Result j = new Result();
 		try {
 			String fileName = "送审决算信息"+DateUtils.getDate("yyyyMMddHHmmss")+".xlsx";