Merge remote-tracking branch 'origin/master'

whepi-doc/login.sql

@@ -13,10 +13,15 @@ create table sys_user
   be_active           CHAR(1)         not null default 'Y' comment '是否活动 Y=活动/N=禁用/D=删除',
   create_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP   COMMENT '建立时间',
   update_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新日期',
-  primary key ( user_id )
+  primary key ( user_id ),
+  UNIQUE INDEX `login_name`(`login_name`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT = '用户资料';
 
-
+-- insert into sys_user
+-- select ur.user_id,'账户','密码',ur.role_id as user_type,uo.nick_name,'Y',now(),now() from sys_uptown_home uh
+-- left join sys_user_role ur on ur.property_id = uh.house_id
+-- left join sys_user_open uo on uo.user_id = ur.user_id
+-- where uh.phone = "电话号码"
 
 drop table if exists sys_user_open;
 create table sys_user_open

whepi-web/src/main/java/com/bofeng/service/RiBaoService.java

@@ -88,7 +88,7 @@ public class RiBaoService {
         }
 
         ribaoDetail.setSuspectedStatus(suspectedStatus);
-        if (ribaoDetail.getSuspectedId().longValue() > 0L) {
+        if (ribaoDetail.getSuspectedId() != null && ribaoDetail.getSuspectedId().longValue() > 0L) {
             ribaoDetail.setTimeUpdate(dateTime);
             msSuspectedMapper.updateById(ribaoDetail);
         } else {

whepi-web/src/main/java/com/bofeng/wx/controller/RiBaoController.java

@@ -7,9 +7,13 @@ import com.bofeng.service.MsSuspectedService;
 import com.bofeng.service.RiBaoService;
 import com.yvan.Model;
 import com.yvan.ModelOps;
+import com.yvan.mvc.JsonBody;
 import com.yvan.mvc.Pd;
+import com.yvan.platform.JsonWapper;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
@@ -87,20 +91,22 @@ public class RiBaoController {
 
     // 新增或者修改日报关联的家人 必须传reportId，userCreate，userUpdate
     @PostMapping("/riBao/addOrEditRibaoDetail")
-    public Model<MsSuspected> addOrEditRibaoDetail(@RequestBody MsSuspected msSuspected) {
+    public Model<MsSuspected> addOrEditRibaoDetail(@JsonBody MsSuspected msSuspected) {
         return ModelOps.newSuccess(riBaoService.addOrEditRibaoDetail(msSuspected));
     }
 
     // 删除日报关联的家人
     @PostMapping("/riBao/delRibaoDetail")
-    public ModelOps delRibaoDetail(@RequestParam("suspectedId") Long suspectedId) {
+    public ModelOps delRibaoDetail(JsonWapper jsonWapper) {
+        Long suspectedId = jsonWapper.asObject(Long.class, "suspectedId");
         return ModelOps.newSuccess(riBaoService.delRibaoDetail(suspectedId));
     }
 
 
     // 完成提交日报
     @PostMapping("/riBao/editRibao")
-    public Model<MsReport> editRibao(@RequestParam("reportId") Long reportId) {
+    public Model<MsReport> editRibao(JsonWapper jsonWapper) {
+        Long reportId = jsonWapper.asObject(Long.class, "reportId");
         MsReport msReport = riBaoService.editRibao(reportId);
 
         return ModelOps.newSuccess(msReport);