Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

common/common-entity/sql记录

@@ -2189,9 +2189,9 @@ CREATE TABLE `base_opinion_feedback` (
  `id` int(11) NOT NULL AUTO_INCREMENT,
  `suggest_user_id` varchar(50) DEFAULT NULL COMMENT '反馈用户',
  `suggest_user_name` varchar(50) DEFAULT NULL COMMENT '反馈用户名字',
  `user_type` int(2) DEFAULT NULL COMMENT '反馈用户类型 0家属 1社工 2助老员',
  `user_type` int(2) DEFAULT NULL COMMENT '反馈用户类型 0家属 1医生 2社工 3教师  4助老员\r\n',
  `feedback_type` int(2) DEFAULT NULL COMMENT '反馈工单类型',
  `suggest_describe` varchar(50) DEFAULT NULL COMMENT '反馈内容',
  `suggest_describe` varchar(500) DEFAULT NULL COMMENT '反馈内容',
  `suggest_user_phone` varchar(20) DEFAULT NULL COMMENT '反馈人手机号',
  `suggest_status` int(2) DEFAULT NULL COMMENT '反馈状态 0处理中 1已回复',
  `create_time` timestamp NULL DEFAULT NULL COMMENT '反馈时间',
@@ -2199,7 +2199,7 @@ CREATE TABLE `base_opinion_feedback` (
  `reply_time` timestamp NULL DEFAULT NULL COMMENT '回复时间',
  `suggest_img_url` varchar(2500) DEFAULT NULL COMMENT '图片地址“，”分割',
  PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=48 DEFAULT CHARSET=utf8mb4 COMMENT='医养意见反馈表';
) ENGINE=InnoDB AUTO_INCREMENT=67 DEFAULT CHARSET=utf8mb4 COMMENT='医养意见反馈表';
ALTER table wlyy_user_role add COLUMN `del` int(1) DEFAULT NULL COMMENT '是否生效';
@@ -2209,8 +2209,8 @@ INSERT INTO `base`.`wlyy_hospital_sys_dict`(`id`, `saas_id`, `dict_name`, `dict_
INSERT INTO `base`.`wlyy_hospital_sys_dict`(`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`, `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES ('opinionFeedback3', NULL, 'opinionFeedbackType', '3', '功能建议', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
INSERT INTO `base`.`wlyy_hospital_sys_dict`(`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`, `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES ('opinionFeedback4', NULL, 'opinionFeedbackType', '4', '其他', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
INSERT INTO `base`.`wlyy_hospital_sys_dict`(`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`, `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES ('opinionFeedbackUser1', NULL, 'opinionFeedbackUser', '0', '家属', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
INSERT INTO `base`.`wlyy_hospital_sys_dict`(`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`, `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES ('opinionFeedbackUser2', NULL, 'opinionFeedbackUser', '1', '社工', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
INSERT INTO `base`.`wlyy_hospital_sys_dict`(`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`, `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES ('opinionFeedbackUser3', NULL, 'opinionFeedbackUser', '2', '助老员', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
INSERT INTO `base`.`wlyy_hospital_sys_dict`(`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`, `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES ('opinionFeedbackstatus1', NULL, 'opinionFeedbackstatus', '0', '处理中', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
INSERT INTO `base`.`wlyy_hospital_sys_dict`(`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`, `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES ('opinionFeedbackstatus2', NULL, 'opinionFeedbackstatus', '1', '已回复', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
INSERT INTO `base`.`wlyy_hospital_sys_dict`(`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`, `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES ('opinionFeedbackUser0', NULL, 'opinionFeedbackUser', '0', '家属', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
INSERT INTO `base`.`wlyy_hospital_sys_dict`(`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`, `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES ('opinionFeedbackUser1', NULL, 'opinionFeedbackUser', '1', '社区医生', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
INSERT INTO `base`.`wlyy_hospital_sys_dict`(`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`, `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES ('opinionFeedbackUser2', NULL, 'opinionFeedbackUser', '2', '社工', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
INSERT INTO `base`.`wlyy_hospital_sys_dict`(`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`, `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES ('opinionFeedbackUser3', NULL, 'opinionFeedbackUser', '3', '教师', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
INSERT INTO `base`.`wlyy_hospital_sys_dict`(`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`, `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES ('opinionFeedbackUser4', NULL, 'opinionFeedbackUser', '4', '助老员', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/customerService/CustomerServiceController.java

@@ -48,7 +48,7 @@ public class CustomerServiceController extends EnvelopRestEndpoint {
            if (byUserPhone != null) {
                return ObjEnvelop.getSuccess("查找成功", byUserPhone, 200);
            } else {
                return ObjEnvelop.getError("查找失败", 400);
                return ObjEnvelop.getError("账号不存在", 400);
            }
        } catch (Exception e) {
            e.printStackTrace();
@@ -66,7 +66,9 @@ public class CustomerServiceController extends EnvelopRestEndpoint {
                return Envelop.getError("添加失败!当前已存在一个生效客服!",500);
            }else if (result == -1){
                return Envelop.getError("添加失败!当前客服已存在未生效状态!",500);
            }else {
            }else if (result == -2){
               return Envelop.getError("添加失败!添加用户非管理员!",500);
           }else {
               return success("添加成功");
           }

svr/svr-base/src/main/java/com/yihu/jw/base/service/customerService/CustomerService.java

@@ -59,10 +59,13 @@ public class CustomerService {
    public Integer addCustomerServiceUser(String id) {
        String sql = "select count(id) from wlyy_user_role where del = 1";
        String sqldel = "select count(id) from wlyy_user_role where user ='" + id + "' and del = 0";
        String sqladmin = "select count(id) from wlyy_user_role where user ='" + id + "' and role = '330100'";
        Integer total = jdbcTemplate.queryForObject(sql, Integer.class);
        Integer delTotal = jdbcTemplate.queryForObject(sqldel, Integer.class);
        Integer adminTital = jdbcTemplate.queryForObject(sqladmin, Integer.class);
        if (total > 0) return 0;
        if (delTotal > 0) return -1;
        if (!(adminTital > 0)) return -2;
        String instSql = "INSERT INTO `base`.`wlyy_user_role`(`user`, `role`, `czy`, `czrq`,`del`) VALUES ('" + id + "', 'chjd_kf', NULL, NULL,1);";
        jdbcTemplate.update(instSql);
        return 1;

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/dao/role/DoctorRoleDao.java

@@ -14,6 +14,6 @@ import java.util.List;
public interface DoctorRoleDao extends JpaRepository<DoctorRole, Long> {
    @Query(value = "select b.* from wlyy_user_role a,wlyy_role b where a.role = b.code and a.user = ?1",nativeQuery = true)
    @Query(value = "select b.* from wlyy_user_role a,wlyy_role b where a.role = b.code and a.user = ?1 and ((a.del = 1 OR a.del IS NULL) )  ",nativeQuery = true)
    List<DoctorRole> findUserRole(String user);
}

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/customerService/CustomerService.java

@@ -73,28 +73,32 @@ public class CustomerService {
        JSONArray jsonArray = JSONArray.parseArray(sing);
        JSONArray result = new JSONArray();
        for (int i = 0; i < jsonArray.size(); i++) {
        System.out.println("-----imAddr:"+imAddr);
        String sql = "SELECT CASE WHEN archive_type = 1 THEN '老人' WHEN archive_type = 2 THEN '幼儿' WHEN archive_type = 3 THEN '家属' END AS type FROM base_patient  WHERE  id = '<id>' AND del = 1 " +
                "UNION  " +
                "SELECT CASE " +
                " WHEN doctor_level = 2 THEN " +
                " '社工' " +
                "WHEN doctor_level = 4 THEN " +
                "'助老员' " +
                "WHEN doctor_level = 3 THEN " +
                "'教师' " +
                "END AS type FROM base_doctor WHERE id = '<id>'  ";
       for (int i = 0; i < jsonArray.size(); i++) {
            JSONObject jsonObject = jsonArray.getJSONObject(i);
            System.out.println(jsonObject.get("sender_id") + ":" + jsonObject.get("sender_name"));
            if (jsonObject.get("sender_id") != null && StringUtils.isNotBlank(jsonObject.get("sender_id").toString())) {
           /*  if (jsonObject.get("sender_id") != null && StringUtils.isNotBlank(jsonObject.get("sender_id").toString())&&!jsonObject.get("sender_id").toString().equals(user_id)) {
                String id = jsonObject.get("sender_id").toString();
                String sql = "SELECT CASE WHEN archive_type = 1 THEN '老人' WHEN archive_type = 2 THEN '幼儿' WHEN archive_type = 3 THEN '家属' END AS type FROM base_patient  WHERE  id = '" + id + "' AND del = 1 " +
                        "UNION  " +
                        "SELECT CASE " +
                        " WHEN doctor_level = 2 THEN " +
                        " '社工' " +
                        "WHEN doctor_level = 4 THEN " +
                        "'助老员' " +
                        "WHEN doctor_level = 3 THEN " +
                        "'教师' " +
                        "END AS type FROM base_doctor WHERE id = '" + id + "'  ";
                List<Map<String, Object>> list = jdbcTemplate.queryForList(sql);
                String labelSql = sql.replace("<id>",id);
                List<Map<String, Object>> list = jdbcTemplate.queryForList(labelSql);
                if (list.size() > 0) {
                    jsonObject.put("userType", list.get(0).get("type").toString());
                }else {
                    jsonObject.put("userType", "未知");
                }
               /* for (Map<String, Object> map : list) {
               *//* for (Map<String, Object> map : list) {
                    switch (map.get("type").toString()){
                        case "老人":
                            String fpatientSql = "SELECT count(id) FROM base_patient_family_member  WHERE  family_member = '"+id+"'";
@@ -107,10 +111,27 @@ public class CustomerService {
                            break;
                    }
                }*/
            }
                }*//*
            }else {*/
                JSONArray participantsArray = JSONArray.parseArray(jsonObject.get("participantsTimeArray").toString());
                for (Object participantObj : participantsArray) {
                    JSONObject participant = JSONObject.parseObject(participantObj.toString());
                    if (!user_id.equals(participant.getString("id"))) {
                        String id = participant.getString("id");
                        String labelSql = sql.replace("<id>",id);
                        List<Map<String, Object>> list = jdbcTemplate.queryForList(labelSql);
                        if (list.size() > 0) {
                            jsonObject.put("userType", list.get(0).get("type").toString());
                        }else {
                            jsonObject.put("userType", "未知");
                        }
                    }
                }
           /* }*/
            result.add(jsonObject);
        }
       }
        return result;
    }