diff --git a/pom.xml b/pom.xml index a95ef8d..1bd1719 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ 5.1.47 2.3.28 1.1.9 - 1.0.1-SNAPSHOT + 1.0.2-SNAPSHOT 5.22.0 7.1.0.M6 1.7 @@ -148,7 +148,7 @@ com.cm cloud-central-control-client - 1.0.1-SNAPSHOT + ${cm-cloud.version} diff --git a/src/main/java/com/cm/inspection/controller/apis/check/Check2Controller.java b/src/main/java/com/cm/inspection/controller/apis/check/Check2Controller.java index fb93171..6952ef6 100644 --- a/src/main/java/com/cm/inspection/controller/apis/check/Check2Controller.java +++ b/src/main/java/com/cm/inspection/controller/apis/check/Check2Controller.java @@ -1,19 +1,25 @@ package com.cm.inspection.controller.apis.check; +import com.cm.common.annotation.CheckRequestBodyAnnotation; import com.cm.common.base.AbstractController; import com.cm.common.component.SecurityComponent; import com.cm.common.constants.ISystemConstant; +import com.cm.common.exception.ParamsException; import com.cm.common.exception.RemoveException; import com.cm.common.exception.SearchException; import com.cm.common.pojo.ListPage; import com.cm.common.result.ErrorResult; import com.cm.common.result.SuccessResult; import com.cm.common.result.SuccessResultList; +import com.cm.inspection.enums.GridPersonnelTypeEnum; import com.cm.inspection.pojo.dtos.check.Check2DTO; import com.cm.inspection.pojo.dtos.checkitem.CheckItemDTO; import com.cm.inspection.pojo.dtos.hiddendangerreport.HiddenDangerReportDTO; +import com.cm.inspection.pojo.vos.check.CheckCompleteVO; +import com.cm.inspection.pojo.vos.check.StreetToLeaderVO; import com.cm.inspection.service.check.ICheck2Service; import io.swagger.annotations.*; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -146,6 +152,36 @@ public class Check2Controller extends AbstractController { return check2Service.listPageStreetOfMine(page); } + @ApiOperation(value = "街道案件完成", notes = "街道案件完成接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "checkId", value = "检查ID", paramType = "path"), + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @PutMapping("update-street-complete/{checkId}") + public SuccessResult updateStreetComplete(@PathVariable("checkId") String checkId, + @RequestBody CheckCompleteVO checkCompleteVO) { + check2Service.updateStreetComplete(checkId, checkCompleteVO); + return new SuccessResult(); + } + + @ApiOperation(value = "街道案件上报领导", notes = "街道案件上报领导接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "checkId", value = "检查ID", paramType = "path"), + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @PutMapping("update-street-to-leader/{checkId}") + @CheckRequestBodyAnnotation + public SuccessResult updateStreetToLeader(@PathVariable("checkId") String checkId, + @RequestBody StreetToLeaderVO streetToLeaderVO) { + if (StringUtils.equals(GridPersonnelTypeEnum.DISTRICT.getValue(), streetToLeaderVO.getLeaderType())) { + if (StringUtils.isBlank(streetToLeaderVO.getLeaderId())) { + throw new ParamsException("领导不能为空"); + } + } + check2Service.updateStreetToLeader(checkId, streetToLeaderVO); + return new SuccessResult(); + } + @ApiOperation(value = "我的旗县区委办局案件列表", notes = "我的旗县区委办局案件列表接口") @ApiImplicitParams({ @ApiImplicitParam(name = "page", value = "当前页码", paramType = "query", dataType = "Integer", defaultValue = "1"), diff --git a/src/main/java/com/cm/inspection/enums/CheckProcessParamsEnum.java b/src/main/java/com/cm/inspection/enums/CheckProcessParamsEnum.java index 90e8528..844b937 100644 --- a/src/main/java/com/cm/inspection/enums/CheckProcessParamsEnum.java +++ b/src/main/java/com/cm/inspection/enums/CheckProcessParamsEnum.java @@ -14,7 +14,9 @@ public enum CheckProcessParamsEnum { IS_ALL_PASS("isAllPass", "是否全部通过"), IS_RE_REPORT("isReReport", "是否复查"), - LAST_CHECK_ID("lastCheckId", "最后的检查ID"); + LAST_CHECK_ID("lastCheckId", "最后的检查ID"), + HANDLE_TYPE("handleType", "处理类型"), + LEADER("leader", "领导"); private String value; private String summary; diff --git a/src/main/java/com/cm/inspection/enums/HandleTypeEnum.java b/src/main/java/com/cm/inspection/enums/HandleTypeEnum.java new file mode 100644 index 0000000..6d7c3f9 --- /dev/null +++ b/src/main/java/com/cm/inspection/enums/HandleTypeEnum.java @@ -0,0 +1,32 @@ +package com.cm.inspection.enums; + +/** + * When you feel like quitting. Think about why you started + * 当你想要放弃的时候，想想当初你为何开始 + * + * @ClassName: HandleTypeEnum + * @Description: 处理类型 + * @Author: wanggeng + * @Date: 2021/7/16 2:37 下午 + * @Version: 1.0 + */ +public enum HandleTypeEnum { + LEADER("leader", "领导"), + HANDLE("handle", "处理"); + + private String value; + private String summary; + + HandleTypeEnum(String value, String summary) { + this.value = value; + this.summary = summary; + } + + public String getValue() { + return value == null ? "" : value; + } + + public String getSummary() { + return summary == null ? "" : summary; + } +} diff --git a/src/main/java/com/cm/inspection/enums/LeaderTypeEnum.java b/src/main/java/com/cm/inspection/enums/LeaderTypeEnum.java new file mode 100644 index 0000000..e971497 --- /dev/null +++ b/src/main/java/com/cm/inspection/enums/LeaderTypeEnum.java @@ -0,0 +1,32 @@ +package com.cm.inspection.enums; + +/** + * When you feel like quitting. Think about why you started + * 当你想要放弃的时候，想想当初你为何开始 + * + * @ClassName: LeaderEnum + * @Description: 领导类型 + * @Author: wanggeng + * @Date: 2021/7/16 3:07 下午 + * @Version: 1.0 + */ +public enum LeaderTypeEnum { + DEPARTMENT("department", "旗县区委办局"), + DISTRICT("district", "旗县区"); + + private String value; + private String summary; + + LeaderTypeEnum(String value, String summary) { + this.value = value; + this.summary = summary; + } + + public String getValue() { + return value == null ? "" : value; + } + + public String getSummary() { + return summary == null ? "" : summary; + } +} diff --git a/src/main/java/com/cm/inspection/pojo/vos/check/CheckCompleteVO.java b/src/main/java/com/cm/inspection/pojo/vos/check/CheckCompleteVO.java new file mode 100644 index 0000000..7eef7b2 --- /dev/null +++ b/src/main/java/com/cm/inspection/pojo/vos/check/CheckCompleteVO.java @@ -0,0 +1,26 @@ +package com.cm.inspection.pojo.vos.check; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.ToString; + +/** + * When you feel like quitting. Think about why you started + * 当你想要放弃的时候，想想当初你为何开始 + * + * @ClassName: CheckCompleteVO + * @Description: 检查结束 + * @Author: wanggeng + * @Date: 2021/7/16 2:31 下午 + * @Version: 1.0 + */ +@ApiModel +@Data +@ToString +public class CheckCompleteVO { + + @ApiModelProperty(name = "summary", value = "说明") + private String summary; + +} diff --git a/src/main/java/com/cm/inspection/pojo/vos/check/StreetToLeaderVO.java b/src/main/java/com/cm/inspection/pojo/vos/check/StreetToLeaderVO.java new file mode 100644 index 0000000..491502b --- /dev/null +++ b/src/main/java/com/cm/inspection/pojo/vos/check/StreetToLeaderVO.java @@ -0,0 +1,33 @@ +package com.cm.inspection.pojo.vos.check; + +import com.cm.common.annotation.CheckEmptyAnnotation; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.ToString; + +/** + * When you feel like quitting. Think about why you started + * 当你想要放弃的时候，想想当初你为何开始 + * + * @ClassName: StreetToLeaderVO + * @Description: 街道选择领导 + * @Author: wanggeng + * @Date: 2021/7/16 2:10 下午 + * @Version: 1.0 + */ +@Data +@ApiModel +@ToString +public class StreetToLeaderVO { + + @ApiModelProperty(name = "leaderType", value = "领导类型") + @CheckEmptyAnnotation(name = "领导类型", types = {"districtDepartment", "district"}) + private String leaderType; + @ApiModelProperty(name = "leaderId", value = "上级领导ID") + private String leaderId; + @ApiModelProperty(name = "summary", value = "说明") + @CheckEmptyAnnotation(name = "说明") + private String summary; + +} diff --git a/src/main/java/com/cm/inspection/service/check/ICheck2Service.java b/src/main/java/com/cm/inspection/service/check/ICheck2Service.java index 15effef..4dbb747 100644 --- a/src/main/java/com/cm/inspection/service/check/ICheck2Service.java +++ b/src/main/java/com/cm/inspection/service/check/ICheck2Service.java @@ -6,6 +6,8 @@ import com.cm.inspection.pojo.dtos.check.Check2DTO; import com.cm.inspection.pojo.dtos.checkitem.CheckItemDTO; import com.cm.inspection.pojo.dtos.hiddendangerreport.HiddenDangerReportDTO; import com.cm.inspection.pojo.vos.check.Check2VO; +import com.cm.inspection.pojo.vos.check.CheckCompleteVO; +import com.cm.inspection.pojo.vos.check.StreetToLeaderVO; import java.util.List; import java.util.Map; @@ -154,5 +156,19 @@ public interface ICheck2Service { */ SuccessResultList> listPageCityOfMine(ListPage page); + /** + * 结束街道案件 + * + * @param checkId + * @param checkCompleteVO + */ + void updateStreetComplete(String checkId, CheckCompleteVO checkCompleteVO); + /** + * 街道案件上报领导 + * + * @param checkId + * @param streetToLeaderVO + */ + void updateStreetToLeader(String checkId, StreetToLeaderVO streetToLeaderVO); } diff --git a/src/main/java/com/cm/inspection/service/check/impl/Check2ServiceImpl.java b/src/main/java/com/cm/inspection/service/check/impl/Check2ServiceImpl.java index ed852d8..ccd6201 100644 --- a/src/main/java/com/cm/inspection/service/check/impl/Check2ServiceImpl.java +++ b/src/main/java/com/cm/inspection/service/check/impl/Check2ServiceImpl.java @@ -6,17 +6,18 @@ import com.cm.common.result.SuccessResultList; import com.cm.common.utils.HashMapUtil; import com.cm.common.utils.UUIDUtil; import com.cm.inspection.dao.check.ICheck2Dao; -import com.cm.inspection.enums.CheckProcessParamsEnum; -import com.cm.inspection.enums.CheckTypeEnum; -import com.cm.inspection.enums.GridPersonnelTypeEnum; -import com.cm.inspection.enums.HiddenDangerReportTypeEnum; +import com.cm.inspection.enums.*; import com.cm.inspection.pojo.dtos.check.Check2DTO; import com.cm.inspection.pojo.dtos.checkitem.CheckItemDTO; import com.cm.inspection.pojo.dtos.checkitemoption.CheckItemOptionDTO; import com.cm.inspection.pojo.dtos.enterprise.EnterpriseDTO; +import com.cm.inspection.pojo.dtos.gridpersonnel.GridPersonnelDTO; import com.cm.inspection.pojo.dtos.hiddendangerreport.HiddenDangerReportDTO; import com.cm.inspection.pojo.dtos.industrycheckitem.IndustryCheckItemDTO; +import com.cm.inspection.pojo.pos.gridpersonnel.GridPersonnelPO; import com.cm.inspection.pojo.vos.check.Check2VO; +import com.cm.inspection.pojo.vos.check.CheckCompleteVO; +import com.cm.inspection.pojo.vos.check.StreetToLeaderVO; import com.cm.inspection.pojo.vos.hiddendangerreport.HiddenDangerReportVO; import com.cm.inspection.service.BaseService; import com.cm.inspection.service.check.ICheck2Service; @@ -225,6 +226,77 @@ public class Check2ServiceImpl extends BaseService implements ICheck2Service { return listPage(page); } + @Override + public void updateStreetComplete(String checkId, CheckCompleteVO checkCompleteVO) { + Task task = processService.getTaskByAssigneeAndVariableKeyAndValue(securityComponent.getCurrentUser().getUserId(), CheckProcessParamsEnum.LAST_CHECK_ID.getValue(), checkId); + if (task == null) { + throw new SearchException("任务不存在"); + } + LOG.debug("标记任务为完成状态"); + updateCheckIsCompleteInfo(null, checkId, 1); + + LOG.debug("执行流程"); + Map params = getHashMap(4); + params.put("summary", checkCompleteVO.getSummary()); + params.put(CheckProcessParamsEnum.HANDLE_TYPE.getValue(), HandleTypeEnum.HANDLE.getValue()); + processService.saveTaskCompleteByTaskId(task.getId(), params); + } + + @Override + public void updateStreetToLeader(String checkId, StreetToLeaderVO streetToLeaderVO) { + Task task = processService.getTaskByAssigneeAndVariableKeyAndValue(securityComponent.getCurrentUser().getUserId(), CheckProcessParamsEnum.LAST_CHECK_ID.getValue(), checkId); + if (task == null) { + throw new SearchException("任务不存在"); + } + if (StringUtils.equals(streetToLeaderVO.getLeaderType(), GridPersonnelTypeEnum.DISTRICT_DEPARTMENT.getValue())) { + updateStreetToDistrictDepartment(task, streetToLeaderVO.getSummary()); + } else { + updateStreetToDistrict(streetToLeaderVO.getLeaderId(), task, streetToLeaderVO.getSummary()); + } + } + + /** + * 上报案件到委办局，逻辑：查找当前用户上级网格员，存在则将案件进行转发，否则抛出异常 + * + * @param task + * @param summary + */ + private void updateStreetToDistrictDepartment(Task task, String summary) { + String userId = securityComponent.getCurrentUser().getUserId(); + GridPersonnelPO gridPersonnelPO = gridPersonnelService.getLeaderPOByUserId(userId); + if (gridPersonnelPO == null) { + throw new SearchException("上级领导不存在"); + } + Map params = getHashMap(4); + params.put(CheckProcessParamsEnum.HANDLE_TYPE.getValue(), HandleTypeEnum.LEADER.getValue()); + params.put(CheckProcessParamsEnum.LEADER.getValue(), LeaderTypeEnum.DEPARTMENT.getValue()); + params.put(GridPersonnelTypeEnum.DISTRICT_DEPARTMENT.getValue(), userId); + params.put("summary", summary); + + processService.saveTaskCompleteByTaskId(task.getId(), params); + } + + /** + * 上报案件到旗县区管理员，逻辑：根据传入的用户ID（用户选择的）查找网格员，存在则将案件进行转发，否则抛出异常 + * + * @param leaderUserId + * @param task + * @param summary + */ + private void updateStreetToDistrict(String leaderUserId, Task task, String summary) { + GridPersonnelDTO gridPersonnelDTO = gridPersonnelService.getGridPersonnelByUserId(leaderUserId); + if (gridPersonnelDTO == null) { + throw new SearchException("上级领导不存在"); + } + Map params = getHashMap(4); + params.put(CheckProcessParamsEnum.HANDLE_TYPE.getValue(), HandleTypeEnum.LEADER.getValue()); + params.put(CheckProcessParamsEnum.LEADER.getValue(), LeaderTypeEnum.DISTRICT.getValue()); + params.put(GridPersonnelTypeEnum.DISTRICT_DEPARTMENT.getValue(), gridPersonnelDTO.getUserId()); + params.put("summary", summary); + + processService.saveTaskCompleteByTaskId(task.getId(), params); + } + /** * 开启检查流程 * diff --git a/src/main/java/com/cm/inspection/service/gridpersonnel/IGridPersonnelService.java b/src/main/java/com/cm/inspection/service/gridpersonnel/IGridPersonnelService.java index 46cee8d..19347f1 100644 --- a/src/main/java/com/cm/inspection/service/gridpersonnel/IGridPersonnelService.java +++ b/src/main/java/com/cm/inspection/service/gridpersonnel/IGridPersonnelService.java @@ -9,6 +9,7 @@ import com.cm.common.result.SuccessResultData; import com.cm.common.result.SuccessResultList; import com.cm.inspection.enums.GridPersonnelTypeEnum; import com.cm.inspection.pojo.dtos.gridpersonnel.GridPersonnelDTO; +import com.cm.inspection.pojo.pos.gridpersonnel.GridPersonnelPO; import com.cm.inspection.pojo.vos.gridpersonnel.GridPersonnelVO; import java.io.UnsupportedEncodingException; @@ -166,6 +167,14 @@ public interface IGridPersonnelService { */ GridPersonnelDTO getLeader(String userId, int isGridOperator) throws SearchException; + /** + * 上级领导（网格员） + * + * @param userId 用户ID + * @return + */ + GridPersonnelPO getLeaderPOByUserId(String userId); + /** * 网格员数量 * diff --git a/src/main/java/com/cm/inspection/service/gridpersonnel/impl/GridPersonnelServiceImpl.java b/src/main/java/com/cm/inspection/service/gridpersonnel/impl/GridPersonnelServiceImpl.java index c8693aa..7b12a02 100644 --- a/src/main/java/com/cm/inspection/service/gridpersonnel/impl/GridPersonnelServiceImpl.java +++ b/src/main/java/com/cm/inspection/service/gridpersonnel/impl/GridPersonnelServiceImpl.java @@ -270,7 +270,8 @@ public class GridPersonnelServiceImpl extends BaseService implements IGridPerson return gridPersonnelPO.getUserId(); } - private GridPersonnelPO getLeaderPOByUserId(String userId) { + @Override + public GridPersonnelPO getLeaderPOByUserId(String userId) { Map params = getHashMap(2); params.put("userId", userId); return gridPersonnelDao.getLeaderPO(params); diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index 1c18a94..3a0cb86 100644 --- a/src/main/resources/application-test.yml +++ b/src/main/resources/application-test.yml @@ -20,14 +20,14 @@ spring: max-request-size: 1GB datasource: druid: -# url: jdbc:mysql://49.233.36.36:6688/db_cloud_inspection?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false - url: jdbc:mysql://127.0.0.1:3306/db_cloud_inspection?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false + url: jdbc:mysql://49.233.36.36:6688/db_cloud_inspection?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false +# url: jdbc:mysql://127.0.0.1:3306/db_cloud_inspection?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false db-type: mysql driver-class-name: com.mysql.jdbc.Driver -# username: wanggeng - username: root -# password: WenG>2132997 - password: root + username: wanggeng +# username: root + password: WenG>2132997 +# password: root initial-size: 2 min-idle: 2 max-active: 5 @@ -88,8 +88,8 @@ security: oauth-server: http://127.0.0.1:7001/usercenter oauth-logout: ${security.oauth2.oauth-server}/logout?redirect_uri=${server.url} client: - client-id: 32ec344a5fd04fd9911586df5d1dc36b - client-secret: a2NORTAyZmthdTNtVHNwLytGVVo0ckFhNktHQU9JWVFmUks0TGw5L2hQRW1ac2wwZTJHWk5NbXh3L3h3U2c4Rg== + client-id: 44a8dc867f7f4465b7ba6065d87e30d7 + client-secret: bTRCTEw1TEZkL284bVhLOXJ2NDYrSUlGdU1DSlNGaGdLTWhEb1l1VHZHMG1ac2wwZTJHWk5NbXh3L3h3U2c4Rg== user-authorization-uri: ${security.oauth2.oauth-server}/oauth_client/authorize access-token-uri: ${security.oauth2.oauth-server}/oauth_client/token grant-type: authorization_code diff --git a/src/main/resources/static/route/check/list-check2-city-of-mine.html b/src/main/resources/static/route/check/list-check2-city-of-mine.html deleted file mode 100644 index 184d378..0000000 --- a/src/main/resources/static/route/check/list-check2-city-of-mine.html +++ /dev/null @@ -1,578 +0,0 @@ - - - - - - - - - - - - - - - -
-
-
-
-
-
-
- -
-
- -
- -
- -
-
- -
-
- -
-
-
-
- -
- -
- -
- -
- - -
-
- - -
-
-
-
-
- - - - - \ No newline at end of file diff --git a/src/main/resources/static/route/check/list-check2-street-of-mine.html b/src/main/resources/static/route/check2/list-city-of-mine.html similarity index 81% rename from src/main/resources/static/route/check/list-check2-street-of-mine.html rename to src/main/resources/static/route/check2/list-city-of-mine.html index 8f56210..3066042 100644 --- a/src/main/resources/static/route/check/list-check2-street-of-mine.html +++ b/src/main/resources/static/route/check2/list-city-of-mine.html @@ -47,13 +47,6 @@ -
- -
-
- -
-
- -
+
+
+ +
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+ +
+ +
+ + +
+
+ + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/static/route/check/list-check2.html b/src/main/resources/static/route/check2/list.html similarity index 92% rename from src/main/resources/static/route/check/list-check2.html rename to src/main/resources/static/route/check2/list.html index da0f30f..2b29d75 100644 --- a/src/main/resources/static/route/check/list-check2.html +++ b/src/main/resources/static/route/check2/list.html @@ -271,14 +271,14 @@ {field:'photos', width: 200, title: '企业图片', templet: function(row) { var photos = ''; - if(row.factoryGateByEnterpriseId) { - var photoArray = row.factoryGateByEnterpriseId.split(','); + if(row.enterpriseFactoryGate) { + var photoArray = row.enterpriseFactoryGate.split(','); for(var i = 0, item; item = photoArray[i++];) { photos += ''; } } - if(row.workplaceByEnterpriseId) { - var photoArray = row.workplaceByEnterpriseId.split(','); + if(row.enterpriseWorkplace) { + var photoArray = row.enterpriseWorkplace.split(','); for(var i = 0, item; item = photoArray[i++];) { photos += ''; } @@ -299,8 +299,8 @@ templet: function(row) { var infoDiv = ''; infoDiv += ''; - infoDiv += ''; - infoDiv += ''; + infoDiv += ''; + infoDiv += ''; infoDiv += '
'+ row.gmtCreate +'
企业名称
'+ row.nameJoinByEnterpriseId +'
企业类型'+ row.typeDictionaryName +'
企业名称
'+ row.enterpriseName +'
企业类型'+ row.enterpriseTypeName +'
'; return infoDiv; } @@ -308,12 +308,12 @@ {field:'col2', width: 400, title: '行业风险', align: 'center', templet: function(row) { var infoDiv = ''; - infoDiv += ''; - infoDiv += ''; - if(row.enterpriseLngByEnterpriseId && row.enterpriseLatByEnterpriseId) { - infoDiv += ''; + infoDiv += ''; + infoDiv += ''; + if(row.enterpriseLng && row.enterpriseLat) { + infoDiv += ''; } else { - infoDiv += ''; + infoDiv += ''; } infoDiv += '
管理行业'+ (row.industryDictionaryName ? row.industryDictionaryName : '-') +'
作业风险'+ (row.riskOperationDictionaryName ? row.riskOperationDictionaryName : '-') +'
'+ (row.addressJoinByEnterpriseId ? row.addressJoinByEnterpriseId : '查看企业定位') +'
管理行业'+ (row.enterpriseIndustryName ? row.enterpriseIndustryName : '-') +'
作业风险'+ (row.enterpriseRiskOperationName ? row.enterpriseRiskOperationName : '-') +'
'+ (row.enterpriseAddress ? row.enterpriseAddress : '查看企业定位') +'
'+ (row.addressJoinByEnterpriseId ? row.addressJoinByEnterpriseId : '-') +'
'+ (row.enterpriseAddress ? row.enterpriseAddress : '-') +'
'; return infoDiv; @@ -322,9 +322,9 @@ {field:'col3', width: 240, title: '人员信息', align: 'center', templet: function(row) { var infoDiv = ''; - infoDiv += ''; - infoDiv += ''; - infoDiv += ''; + infoDiv += ''; + infoDiv += ''; + infoDiv += ''; infoDiv += '
负责人 '+ (row.masterJoinByEnterpriseId ? row.masterJoinByEnterpriseId : '-') +'
联系电话 '+ (row.phoneJoinByEnterpriseId ? row.phoneJoinByEnterpriseId : '-') +'
从业人数 '+ (row.engagedCountJoinByEnterpriseId ? (row.engagedCountJoinByEnterpriseId +' 人') : '-') +'
负责人 '+ (row.enterpriseMaster ? row.enterpriseMaster : '-') +'
联系电话 '+ (row.enterprisePhone ? row.enterprisePhone : '-') +'
从业人数 '+ (row.enterpriseEngagedCount ? (row.enterpriseEngagedCount +' 人') : '-') +'
'; return infoDiv; } @@ -334,7 +334,7 @@ var checkType = '【无检查类型】'; if(row.checkType == 1) { checkType = '【检查】'; - } else if(rowData == 2) { + } else if(row.checkType == 2) { checkType = '【复查】'; } var isComplete = '【未完成】'; @@ -350,14 +350,14 @@ }, {field:'col5', width: 120, title: '操作', align: 'center', templet: function(row) { - var isCoordinationBtn = ''; + var isCoordinationBtn = ''; if(row.isCoordination != 1) { isCoordinationBtn = '不配合'; } var infoDiv = ''; infoDiv += ''; if(row.checkLng && row.checkLat) { - infoDiv += ''; + infoDiv += ''; } infoDiv += '
'+ isCoordinationBtn +'
查看检查位置
查看检查位置
'; return infoDiv; @@ -487,10 +487,10 @@ $(document).on('click', '.check-detail', function() { var checkId = this.dataset.checkid; - var nameJoinByEnterpriseId = this.dataset.name; + var enterpriseName = this.dataset.name; top.dialog.open({ url: top.restAjax.path('route/check2/get-check-item.html?checkId={checkId}', [checkId]), - title: '【'+ nameJoinByEnterpriseId + '】检、复查选项', + title: '【'+ enterpriseName + '】检、复查选项', width: '80%', height: '80%', onClose: function() {} diff --git a/src/main/resources/static/route/check2/update-street-complete.html b/src/main/resources/static/route/check2/update-street-complete.html new file mode 100644 index 0000000..bfb2061 --- /dev/null +++ b/src/main/resources/static/route/check2/update-street-complete.html @@ -0,0 +1,96 @@ + + + + + + + + + + + + + +
+
+
+ + 上级列表/ + 提交 + +
+
+
+
+ +
+ +
+
+
+
+
+ +
+
+
+
+
+
+
+ + + + \ No newline at end of file