修改问题提交

src/main/java/com/chinaitop/depot/business/controller/BusinessPlanController.java

@@ -11,6 +11,7 @@ import com.chinaitop.depot.business.service.BusinessFileService;
 import com.chinaitop.depot.business.service.BusinessPlanService;
 import com.chinaitop.depot.business.service.BusinessStoreWareDetailService;
 import com.chinaitop.depot.utils.HTTPUtils;
+import com.chinaitop.depot.utils.ParameterUtil;
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JsonMappingException;
@@ -24,9 +25,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -438,7 +437,7 @@ public class BusinessPlanController {
                 	plan.setProvinceRemark(provinceRemark);
                 }
                 if(sendTime!=null){
-                	plan.setSendDate(Timestamp.valueOf(sendTime));
+                	plan.setSendDate(ParameterUtil.string2date(sendTime));
                 }
                 businessPlanService.updatePlanStatus(plan);
                 modelMap.put("plan", plan);
@@ -507,11 +506,10 @@ public class BusinessPlanController {
      * @return
      * @throws Exception
      */
-    @RequestMapping(value="/reportSave",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
+    @RequestMapping(value="/reportSave", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
     @ApiOperation(value="计划申请列表", notes = "查询数据列表，支持分页")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "businessPlan", value = "计划", paramType = "query")
-
+            @ApiImplicitParam(name = "businessPlan", value = "计划", paramType = "from")
     })
     public Map<String, Object> reportSave(String businessPlan) throws Exception {
         // Integer userId = userInfo.getUserId();

src/main/java/com/chinaitop/depot/pushs/service/impl/PushServiceImpl.java

@@ -127,7 +127,7 @@ public class PushServiceImpl implements PushsService{
 	@Transactional(rollbackFor = Exception.class)
 	@Override
 	public String updateNoticeState(String inApplicationJson) {
-
+		Map<String,Object> mapData = new HashMap<String, Object>();
 		if (null != inApplicationJson) {
 			/* 将获取到的json串转换成json数组 */
 			JSONArray json_array = JSONArray.parseArray(inApplicationJson);
@@ -144,6 +144,10 @@ public class PushServiceImpl implements PushsService{
 
 				//获取数据
 //				String ids = json_object.get("tzdId").toString();
+				if (ParameterUtil.isnull(json_object.get("tzdNumber"))) {
+					mapData.put("status", "tzdNumber");
+					return JSON.toJSONString(ResponseEntity.ok(mapData));
+				}
 				String numbers = json_object.get("tzdNumber").toString();
 				String inApplication = json_object.get("inApplication").toString();
 
@@ -163,8 +167,6 @@ public class PushServiceImpl implements PushsService{
 			}
 		}
 
-
-		Map<String,Object> mapData = new HashMap<String, Object>();
 		mapData.put("status", "success");
 		return JSON.toJSONString(ResponseEntity.ok(mapData));
 	}

src/main/java/com/chinaitop/depot/unissoft/webservice/NoticePassService.java

@@ -30,7 +30,7 @@ public interface NoticePassService {
     //接收出入库下发的通知单
     public String uploadNoticeDatas(@WebParam(name = "org_id") String org_id,@WebParam(name = "data") String data);
 
-    //接收出入库下发的通知单
+    //接收出入库损益时修改状态
     public String uploadNoticeUnwind(@WebParam(name = "orgId") String orgId,@WebParam(name = "houseId") String houseId);
 
 }