机构修改

donate-console/pom.xml

@@ -52,7 +52,6 @@
             <groupId>com.uas.message</groupId>
             <artifactId>message-sms-api</artifactId>
         </dependency>
-
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

donate-console/src/main/java/com/uas/console/donate/controller/OrgController.java

@@ -4,6 +4,8 @@ import com.alibaba.fastjson.JSONObject;
 import com.uas.console.donate.model.Org;
 import com.uas.console.donate.service.OrgService;
 import com.uas.dfs.service.FileClient;
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
@@ -21,7 +23,8 @@ import java.util.List;
 @RequestMapping("/org")
 public class OrgController {
 
-    private static final SimpleDateFormat codesdf=new SimpleDateFormat("yyyymmddhhmmsssss");
+    private final Logger logger= LogManager.getLogger(getClass());
+
 
     @Autowired
     private OrgService orgService;
@@ -127,11 +130,7 @@ public class OrgController {
             String file7=fileClient.upload(certify.getBytes(),certify.getSize(),"jpg",null);
             org.setCertify(file7);
         }
-        Date date=new Date();
-        //设置机构提交时间
-        org.setSubmitTime(new SimpleDateFormat("yyyy.MM.dd HH:mm").format(date));
-        //设置机构编号
-        org.setCode(codesdf.format(date));
+
         return orgService.sumbit(org);
     }
 

donate-console/src/main/java/com/uas/console/donate/impl/OrgServiceImpl.java

@@ -11,11 +11,15 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.ui.ModelMap;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
 
 @Service
 public class OrgServiceImpl implements OrgService {
 
+    private static final SimpleDateFormat codesdf=new SimpleDateFormat("yyyymmddhhmmsssss");
+
     @Autowired
     private OrgDao orgDao;
 
@@ -27,7 +31,6 @@ public class OrgServiceImpl implements OrgService {
     //保存机构
     public ModelMap save(Org org){
         ModelMap map = new ModelMap();
-        System.out.print(JSON.toJSONString(org));
         //如果机构不是发布状态，就设置为草稿状态
         if(org.getPublish()==null||org.getPublish()==1){
             org.setPublish(1);
@@ -50,6 +53,11 @@ public class OrgServiceImpl implements OrgService {
         org.setStatus(0);
         //设置正式提交
         org.setPublish(2);
+        Date date=new Date();
+        //设置机构提交时间
+        org.setSubmitTime(date);
+        //设置机构编号
+        org.setCode(codesdf.format(date));
         try{
             org = orgDao.save(org);
         } catch (Exception e) {

donate-console/src/main/java/com/uas/console/donate/model/Org.java

@@ -323,13 +323,7 @@ public class Org implements Serializable{
         return date!=null?sdf.format(this.submitTime):null;
     }
 
-    public void setSubmitTime(String submitTimeStr) {
-        Date submitTime = null;
-        try {
-            submitTime = sdf.parse(submitTimeStr);
-        } catch (ParseException e) {
-            e.printStackTrace();
-        }
+    public void setSubmitTime(Date submitTime) {
         this.submitTime = submitTime;
     }