代码初始化

jiangping

2025-04-15 71c893964b732f2026fccc573502a1b503f985fd

 server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java

@@ -390,6 +390,7 @@
                        .selectAs(Member::getName,Workorder::getMemberName)
                        .selectAs(Member::getCompanyName,Workorder::getCompanyName)
                        .select(" c3.name ",Workorder::getTypeName)
                        .select(" c3.name_path ",Workorder::getTypeNamePath)
                        .select(" c4.name ",Workorder::getCategoryName)
                        .leftJoin(Member.class,Member::getId,Workorder::getMemberId)
                        .leftJoin(" category c3 on  t.TYPE_ID = c3.id   ") //风险类型
@@ -428,7 +429,7 @@
    public void dealButton(Workorder workorder,Member member){
        workorder.setPassOnButton(Constants.ZERO);
        workorder.setCloseButton(Constants.ZERO);
        if(org.apache.commons.lang3.StringUtils.isNotBlank(member.getQwId())){
        if(member!=null && org.apache.commons.lang3.StringUtils.isNotBlank(member.getQwId())){
            List<String> closeUserList = new ArrayList<>();
            closeUserList.addAll(Arrays.asList(workorder.getQwnoticeMemberIds().split(",")));
            if(org.apache.commons.lang3.StringUtils.isNotBlank(workorder.getManagerId())){
@@ -548,6 +549,7 @@
                .selectAs(Member::getPhone,Workorder::getMemberPhone)
                .select(" c2.name ",Workorder::getCategoryName)
                .select(" c3.name ",Workorder::getTypeName)
                .select(" c3.name_path ",Workorder::getTypeNamePath)
                .leftJoin(Member.class,Member::getId,Workorder::getMemberId)
                .leftJoin(" category c3 on  t.TYPE_ID = c3.id   ") //风险类型
                .leftJoin(" category c2 on  t.CATEGORY_ID = c2.id   ") //DCA一级问题编码
@@ -955,9 +957,9 @@

    private Map<String, String> getEmailContentFormByModel(Workorder workorder) {
        Map<String, String>  map =  new LinkedHashMap<>();
        map.put("上报人",workorder.getMemberName()+"/" +workorder.getCompanyName());
        map.put("上报人",workorder.getCompanyName()+"/" +workorder.getMemberName());
        map.put("上报时间",DateUtil.getPlusTime2(workorder.getSubmitDate()));
        map.put("事件发生时间/地点",DateUtil.getPlusTime2(workorder.getHappenTime())+"/"+workorder.getLocationName());
        map.put("事件发生时间/地点",DateUtil.getPlusTime2(workorder.getHappenTime())+" / "+workorder.getLocationName());
        map.put("伤害类型", workorder.getTypeName());
        map.put("是否外部就医", Constants.equalsInteger(workorder.getOutJiuyi(),Constants.ONE)?"是":"否");
        map.put("是否医务室", Constants.equalsInteger(workorder.getIsYiwushi(),Constants.ONE)?"是":"否");