Tenlion/btyjj-inspection
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整企业字段，完成污染情况

Browse Source
This commit is contained in:
wenc000 2020-10-19 17:49:28 +08:00
parent 12d42e1417
commit bb6df2735f
12 changed files with 826 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pom.xml
View File

@ -108,11 +108,11 @@
<version>${activiti.version}</version>
</dependency>
<dependency>
<groupId>com.cm</groupId>
<artifactId>cloud-central-control-client</artifactId>
<version>1.0.1-SNAPSHOT</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>com.cm</groupId>-->
<!-- <artifactId>cloud-central-control-client</artifactId>-->
<!-- <version>1.0.1-SNAPSHOT</version>-->
<!-- </dependency>-->
</dependencies>
<build>

26
src/main/java/com/cm/inspection/controller/apis/enterprise/EnterpriseController.java
View File

@ -12,6 +12,8 @@ import com.cm.common.result.ErrorResult;
import com.cm.common.result.SuccessResult;
import com.cm.common.result.SuccessResultList;
import com.cm.inspection.pojo.dtos.enterprise.EnterpriseDTO;
import com.cm.inspection.pojo.dtos.enterprise.EnterprisePollutionDTO;
import com.cm.inspection.pojo.vos.enterprise.EnterprisePollutionVO;
import com.cm.inspection.pojo.vos.enterprise.EnterpriseVO;
import com.cm.inspection.service.enterprise.IEnterpriseService;
import io.swagger.annotations.*;
@ -121,7 +123,7 @@ public class EnterpriseController extends AbstractController {
@ApiOperation(value = "企业列表（通过用户ID）", notes = "企业列表（通过用户ID）接口")
@ApiImplicitParams({
@ApiImplicitParam(name = "userId", value = "token", paramType = "userId"),
@ApiImplicitParam(name = "userId", value = "userId", paramType = "path"),
})
@ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
@GetMapping("listenterprisebyuserid/{userId}")
@ -129,4 +131,26 @@ public class EnterpriseController extends AbstractController {
return enterpriseService.listEnterpriseByUserId(userId);
}
@ApiOperation(value = "修改企业污染（通过企业ID）", notes = "修改企业污染（通过企业ID）接口")
@ApiImplicitParams({
@ApiImplicitParam(name = "enterpriseId", value = "企业ID", paramType = "path")
})
@ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
@PutMapping("updateenterprisepollution/{enterpriseId}")
@CheckRequestBodyAnnotation
public SuccessResult updateEnterprisePollution(@PathVariable("enterpriseId") String enterpriseId, @RequestBody EnterprisePollutionVO enterprisePollutionVO) throws Exception {
return enterpriseService.updateEnterprisePollution(enterpriseId, enterprisePollutionVO);
}
@ApiOperation(value = "企业污染详情（通过企业ID）", notes = "企业污染详情（通过企业ID）接口")
@ApiImplicitParams({
@ApiImplicitParam(name = "enterpriseId", value = "enterpriseId", paramType = "path"),
})
@ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
@GetMapping("getenterprisepollutionbyenterpriseid/{enterpriseId}")
public EnterprisePollutionDTO getEnterprisePollutionByEnterpriseId(@PathVariable("enterpriseId") String enterpriseId) {
EnterprisePollutionDTO enterprisePollutionDTO = enterpriseService.getEnterprisePollutionByEnterpriseId(enterpriseId);
return enterprisePollutionDTO == null ? new EnterprisePollutionDTO() : enterprisePollutionDTO;
}
}

24
src/main/java/com/cm/inspection/pojo/dtos/enterprise/EnterpriseDTO.java
View File

@ -78,6 +78,10 @@ public class EnterpriseDTO implements Serializable {
private String bussinessRegNum;
@ApiModelProperty(name = "bussinessLicense", value = "营业执照")
private String bussinessLicense;
@ApiModelProperty(name = "bussinessLicenseStartDate", value = "营业执照开始日期")
private String bussinessLicenseStartDate;
@ApiModelProperty(name = "bussinessLicenseEndDate", value = "营业执照结束日期")
private String bussinessLicenseEndDate;
@ApiModelProperty(name = "legalPerson", value = "法人")
private String legalPerson;
@ApiModelProperty(name = "legalPhone", value = "法人电话")
@ -359,6 +363,22 @@ public class EnterpriseDTO implements Serializable {
this.bussinessLicense = bussinessLicense;
}
public String getBussinessLicenseStartDate() {
return bussinessLicenseStartDate == null ? "" : bussinessLicenseStartDate.trim();
}
public void setBussinessLicenseStartDate(String bussinessLicenseStartDate) {
this.bussinessLicenseStartDate = bussinessLicenseStartDate;
}
public String getBussinessLicenseEndDate() {
return bussinessLicenseEndDate == null ? "" : bussinessLicenseEndDate.trim();
}
public void setBussinessLicenseEndDate(String bussinessLicenseEndDate) {
this.bussinessLicenseEndDate = bussinessLicenseEndDate;
}
public String getLegalPerson() {
return legalPerson == null ? "" : legalPerson.trim();
}
@ -552,6 +572,10 @@ public class EnterpriseDTO implements Serializable {
.append(bussinessRegNum).append('\"');
sb.append(",\"bussinessLicense\":\"")
.append(bussinessLicense).append('\"');
sb.append(",\"bussinessLicenseStartDate\":\"")
.append(bussinessLicenseStartDate).append('\"');
sb.append(",\"bussinessLicenseEndDate\":\"")
.append(bussinessLicenseEndDate).append('\"');
sb.append(",\"legalPerson\":\"")
.append(legalPerson).append('\"');
sb.append(",\"legalPhone\":\"")

24
src/main/java/com/cm/inspection/pojo/vos/enterprise/EnterpriseVO.java
View File

@ -61,6 +61,10 @@ public class EnterpriseVO {
private String bussinessRegNum;
@ApiModelProperty(name = "bussinessLicense", value = "营业执照")
private String bussinessLicense;
@ApiModelProperty(name = "bussinessLicenseStartDate", value = "营业执照开始日期")
private String bussinessLicenseStartDate;
@ApiModelProperty(name = "bussinessLicenseEndDate", value = "营业执照结束日期")
private String bussinessLicenseEndDate;
@ApiModelProperty(name = "legalPerson", value = "法人")
private String legalPerson;
@ApiModelProperty(name = "legalPhone", value = "法人电话")
@ -260,6 +264,22 @@ public class EnterpriseVO {
this.bussinessLicense = bussinessLicense;
}
public String getBussinessLicenseStartDate() {
return bussinessLicenseStartDate == null ? "" : bussinessLicenseStartDate.trim();
}
public void setBussinessLicenseStartDate(String bussinessLicenseStartDate) {
this.bussinessLicenseStartDate = bussinessLicenseStartDate;
}
public String getBussinessLicenseEndDate() {
return bussinessLicenseEndDate == null ? "" : bussinessLicenseEndDate.trim();
}
public void setBussinessLicenseEndDate(String bussinessLicenseEndDate) {
this.bussinessLicenseEndDate = bussinessLicenseEndDate;
}
public String getLegalPerson() {
return legalPerson == null ? "" : legalPerson.trim();
}
@ -425,6 +445,10 @@ public class EnterpriseVO {
.append(bussinessRegNum).append('\"');
sb.append(",\"bussinessLicense\":\"")
.append(bussinessLicense).append('\"');
sb.append(",\"bussinessLicenseStartDate\":\"")
.append(bussinessLicenseStartDate).append('\"');
sb.append(",\"bussinessLicenseEndDate\":\"")
.append(bussinessLicenseEndDate).append('\"');
sb.append(",\"legalPerson\":\"")
.append(legalPerson).append('\"');
sb.append(",\"legalPhone\":\"")

22
src/main/java/com/cm/inspection/service/enterprise/IEnterpriseService.java
View File

@ -9,8 +9,10 @@ import com.cm.common.result.SuccessResult;
import com.cm.common.result.SuccessResultData;
import com.cm.common.result.SuccessResultList;
import com.cm.inspection.pojo.dtos.enterprise.EnterpriseDTO;
import com.cm.inspection.pojo.dtos.enterprise.EnterprisePollutionDTO;
import com.cm.inspection.pojo.vos.enterprise.EnterpriseClassifyVO;
import com.cm.inspection.pojo.vos.enterprise.EnterpriseNatureVO;
import com.cm.inspection.pojo.vos.enterprise.EnterprisePollutionVO;
import com.cm.inspection.pojo.vos.enterprise.EnterpriseVO;
import java.util.List;
@ -136,6 +138,16 @@ public interface IEnterpriseService {
*/
void updateEnterpriseLocationByTokenAndEnterpriseId(String token, String enterpriseId, String checkLng, String checkLat);
/**
* 修改企业污染（通过企业ID）
*
* @param enterpriseId
* @param enterprisePollutionVO
* @return
* @throws Exception
*/
SuccessResult updateEnterprisePollution(String enterpriseId, EnterprisePollutionVO enterprisePollutionVO) throws Exception;
/**
* 企业详情(通过ID)
*
@ -217,4 +229,14 @@ public interface IEnterpriseService {
*/
List<EnterpriseDTO> listEnterpriseByUserId(String userId) throws SearchException;
/**
* 企业污染详情（通过企业ID）
*
* @param enterpriseId
* @return
* @throws SearchException
*/
EnterprisePollutionDTO getEnterprisePollutionByEnterpriseId(String enterpriseId) throws SearchException;
}

17
src/main/java/com/cm/inspection/service/enterprise/impl/EnterpriseServiceImpl.java
View File

@ -223,6 +223,20 @@ public class EnterpriseServiceImpl extends BaseService implements IEnterpriseSer
enterpriseDao.updateEnterpriseLocation(params);
}
@Override
public SuccessResult updateEnterprisePollution(String enterpriseId, EnterprisePollutionVO enterprisePollutionVO) throws Exception {
EnterprisePollutionDTO enterprisePollutionDTO = getEnterprisePollutionByEnterpriseId(enterpriseId);
// 企业因子已经存在
if (enterprisePollutionDTO != null) {
// 更新企业污染因子
updateEnterprisePollution(null, enterpriseId, enterprisePollutionVO);
} else {
// 保存企业污染因子
saveEnterprisePollution(null, enterpriseId, enterprisePollutionVO);
}
return new SuccessResult();
}
/**
* 修改企业
*
@ -362,7 +376,8 @@ public class EnterpriseServiceImpl extends BaseService implements IEnterpriseSer
* @param enterpriseId
* @return
*/
private EnterprisePollutionDTO getEnterprisePollutionByEnterpriseId(String enterpriseId) {
@Override
public EnterprisePollutionDTO getEnterprisePollutionByEnterpriseId(String enterpriseId) {
Map<String, Object> params = getHashMap(2);
params.put("enterpriseId", enterpriseId);
return enterpriseDao.getEnterprisePollution(params);

92
src/main/resources/mybatis/mapper/enterprise/enterprise-mapper.xml
View File

@ -36,6 +36,8 @@
<result column="industry_type" property="industryType"/>
<result column="bussiness_reg_num" property="bussinessRegNum"/>
<result column="bussiness_license" property="bussinessLicense"/>
<result column="bussiness_license_start_date" property="bussinessLicenseStartDate"/>
<result column="bussiness_license_end_date" property="bussinessLicenseEndDate"/>
<result column="legal_person" property="legalPerson"/>
<result column="legal_phone" property="legalPhone"/>
<result column="legal_id_card_front" property="legalIdCardFront"/>
@ -89,6 +91,8 @@
industry_type,
bussiness_reg_num,
bussiness_license,
bussiness_license_start_date,
bussiness_license_end_date,
legal_person,
legal_phone,
legal_id_card_front,
@ -140,6 +144,8 @@
#{industryType},
#{bussinessRegNum},
#{bussinessLicense},
#{bussinessLicenseStartDate},
#{bussinessLicenseEndDate},
#{legalPerson},
#{legalPhone},
#{legalIdCardFront},
@ -194,28 +200,28 @@
<if test="name != null and name != ''">
name = #{name},
</if>
<if test="type != null and type != ''">
<if test="type != null">
type = #{type},
</if>
<if test="area1 != null and area1 != ''">
<if test="area1 != null">
area1 = #{area1},
</if>
<if test="area2 != null and area2 != ''">
<if test="area2 != null">
area2 = #{area2},
</if>
<if test="area3 != null and area3 != ''">
<if test="area3 != null">
area3 = #{area3},
</if>
<if test="area4 != null and area4 != ''">
<if test="area4 != null">
area4 = #{area4},
</if>
<if test="area5 != null and area5 != ''">
<if test="area5 != null">
area5 = #{area5},
</if>
<if test="address != null and address != ''">
<if test="address != null">
address = #{address},
</if>
<if test="industry != null and industry != ''">
<if test="industry != null">
industry = #{industry},
</if>
<if test="engagedCount != null">
@ -227,85 +233,91 @@
<if test="master != null and master != ''">
master = #{master},
</if>
<if test="masterIdCardFront != null and masterIdCardFront != ''">
<if test="masterIdCardFront != null">
master_id_card_front = #{masterIdCardFront},
</if>
<if test="masterIdCardBack != null and masterIdCardBack != ''">
<if test="masterIdCardBack != null">
master_id_card_back = #{masterIdCardBack},
</if>
<if test="masterLegalCertificate != null and masterLegalCertificate != ''">
<if test="masterLegalCertificate != null">
master_legal_certificate = #{masterLegalCertificate},
</if>
<if test="phone != null and phone != ''">
<if test="phone != null">
phone = #{phone},
</if>
<if test="factoryGate != null and factoryGate != ''">
<if test="factoryGate != null">
factory_gate = #{factoryGate},
</if>
<if test="workplace != null and workplace != ''">
<if test="workplace != null">
workplace = #{workplace},
</if>
<if test="industryType != null and industryType != ''">
<if test="industryType != null">
industry_type = #{industryType},
</if>
<if test="bussinessRegNum != null and bussinessRegNum != ''">
<if test="bussinessRegNum != null">
bussiness_reg_num = #{bussinessRegNum},
</if>
<if test="bussinessLicense != null and bussinessLicense != ''">
<if test="bussinessLicense != null">
bussiness_license = #{bussinessLicense},
</if>
<if test="legalPerson != null and legalPerson != ''">
<if test="bussinessLicenseStartDate != null">
bussiness_license_start_date = #{bussinessLicenseStartDate},
</if>
<if test="bussinessLicenseEndDate != null">
bussiness_license_end_date = #{bussinessLicenseEndDate},
</if>
<if test="legalPerson != null">
legal_person = #{legalPerson},
</if>
<if test="legalPhone != null and legalPhone != ''">
<if test="legalPhone != null">
legal_phone = #{legalPhone},
</if>
<if test="legalIdCardFront != null and legalIdCardFront != ''">
<if test="legalIdCardFront != null">
legal_id_card_front = #{legalIdCardFront},
</if>
<if test="legalIdCardBack != null and legalIdCardBack != ''">
<if test="legalIdCardBack != null">
legal_id_card_back = #{legalIdCardBack},
</if>
<if test="summary != null and summary != ''">
summary = #{summary},
</if>
<if test="typeDictionaryName != null and typeDictionaryName != ''">
<if test="typeDictionaryName != null">
type_dictionary_name = #{typeDictionaryName},
</if>
<if test="area1DictionaryName != null and area1DictionaryName != ''">
<if test="area1DictionaryName != null">
area1_dictionary_name = #{area1DictionaryName},
</if>
<if test="area2DictionaryName != null and area2DictionaryName != ''">
<if test="area2DictionaryName != null">
area2_dictionary_name = #{area2DictionaryName},
</if>
<if test="area3DictionaryName != null and area3DictionaryName != ''">
<if test="area3DictionaryName != null">
area3_dictionary_name = #{area3DictionaryName},
</if>
<if test="area4DictionaryName != null and area4DictionaryName != ''">
<if test="area4DictionaryName != null">
area4_dictionary_name = #{area4DictionaryName},
</if>
<if test="area5DictionaryName != null and area5DictionaryName != ''">
<if test="area5DictionaryName != null">
area5_dictionary_name = #{area5DictionaryName},
</if>
<if test="industryTypeDictionaryName != null and industryTypeDictionaryName != ''">
<if test="industryTypeDictionaryName != null">
industry_type_dictionary_name = #{industryTypeDictionaryName},
</if>
<if test="industryDictionaryName != null and industryDictionaryName != ''">
<if test="industryDictionaryName != null">
industry_dictionary_name = #{industryDictionaryName},
</if>
<if test="riskOperationDictionaryName != null and riskOperationDictionaryName != ''">
<if test="riskOperationDictionaryName != null">
risk_operation_dictionary_name = #{riskOperationDictionaryName},
</if>
<if test="classify != null and classify != ''">
classify = #{classify},
</if>
<if test="classifyDictionaryName != null and classifyDictionaryName != ''">
<if test="classifyDictionaryName != null">
classify_dictionary_name = #{classifyDictionaryName},
</if>
<if test="nature != null and nature != ''">
nature = #{nature},
</if>
<if test="natureDictionaryName != null and natureDictionaryName != ''">
<if test="natureDictionaryName != null">
nature_dictionary_name = #{natureDictionaryName},
</if>
<if test="isLogOff != null">
@ -314,11 +326,11 @@
<if test="isCommercialDownstairs != null">
is_commercial_downstairs = #{isCommercialDownstairs},
</if>
<if test="enterpriseLng != null and enterpriseLng != ''">
<if test="enterpriseLng != null">
enterprise_lng = #{enterpriseLng},
</if>
<if test="enterpriseLat != null and enterpriseLat != ''">
enterprise_lat = #{enterpriseLat}
<if test="enterpriseLat != null">
enterprise_lat = #{enterpriseLat},
</if>
modifier = #{modifier},
gmt_modified = #{gmtModified}
@ -464,6 +476,8 @@
t1.industry_type_dictionary_name,
t1.bussiness_reg_num,
t1.bussiness_license,
t1.bussiness_license_start_date,
t1.bussiness_license_end_date,
t1.legal_person,
t1.legal_phone,
t1.legal_id_card_front,
@ -476,6 +490,8 @@
t1.is_log_off,
t1.is_commercial_downstairs,
t1.remarks,
t1.enterprise_lng,
t1.enterprise_lat,
t1.enterprise_id
FROM
gen_enterprise t1
@ -512,6 +528,8 @@
t1.industry_type,
t1.bussiness_reg_num,
t1.bussiness_license,
t1.bussiness_license_start_date,
t1.bussiness_license_end_date,
t1.legal_person,
t1.legal_phone,
t1.legal_id_card_front,
@ -524,6 +542,8 @@
t1.is_log_off,
t1.is_commercial_downstairs,
t1.remarks,
t1.enterprise_lng,
t1.enterprise_lat,
t1.enterprise_id
FROM
gen_enterprise t1
@ -566,6 +586,8 @@
t1.industry_type_dictionary_name,
t1.bussiness_reg_num,
t1.bussiness_license,
t1.bussiness_license_start_date,
t1.bussiness_license_end_date,
t1.legal_person,
t1.legal_phone,
t1.legal_id_card_front,

3
src/main/resources/static/assets/layuiadmin/modules/restajax.js
View File

@ -263,6 +263,9 @@ layui.define(function(exports) {
if(value !== '') {
value += ',';
}
if(key.indexOf('[') < 0 || key.indexOf(']') < 0) {
continue;
}
value += key.substring(checkBoxKey.length + 1, key.length - 1);
delete formObj[key];
}

41
src/main/resources/static/route/enterprise/list-enterprise.html
View File

@ -20,17 +20,15 @@
<div class="layui-inline">
<input type="text" id="keywords" class="layui-input search-item search-item-width-100" placeholder="输入关键字">
</div>
<!--
<div class="layui-inline layui-form search-item" id="area1SelectTemplateBox" lay-filter="area1SelectTemplateBox"></div>
<script id="area1SelectTemplate" type="text/html">
<select id="area1" name="area1" lay-filter="area1" lay-search>
<option value="">选择1级区域</option>
<option value="">选择省</option>
{{# for(var i = 0, item; item = d[i++];) { }}
<option value="{{item.dictionaryId}}">{{item.dictionaryName}}</option>
{{# } }}
</select>
</script>
-->
<div class="layui-inline layui-form search-item" id="area2SelectTemplateBox" lay-filter="area2SelectTemplateBox"></div>
<script id="area2SelectTemplate" type="text/html">
<select id="area2" name="area2" lay-filter="area2" lay-search>
@ -119,13 +117,13 @@
}
// 初始化1级区域下拉选择
// function initArea1Select() {
// top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/81583ade-5466-49aa-b7b6-c643c131ea34', []), {}, null, function(code, data, args) {
// initSelectRadioCheckboxTemplate('area1SelectTemplate', 'area1SelectTemplateBox', data);
// }, function(code, data) {
// top.dialog.msg(data.msg);
// });
// }
function initArea1Select() {
top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/81583ade-5466-49aa-b7b6-c643c131ea34', []), {}, null, function(code, data, args) {
initSelectRadioCheckboxTemplate('area1SelectTemplate', 'area1SelectTemplateBox', data);
}, function(code, data) {
top.dialog.msg(data.msg);
});
}
// 初始化2级区域下拉选择
function initArea2Select(area1) {
@ -181,7 +179,7 @@
});
}
// initArea1Select();
initArea1Select();
initArea2Select();
initArea3Select();
initArea4Select();
@ -367,6 +365,11 @@
return rowData;
}
},
{field: 'operation', width: 100, title: '操作', fixed: 'right', align:'center',
templet: function(row) {
return '<button type="button" class="layui-btn layui-btn-normal layui-btn-sm" lay-event="pollutionEvent">污染情况</button>';
}
},
]],
page: true,
parseData: function(data) {
@ -385,7 +388,8 @@
url: top.restAjax.path(tableUrl, []),
where: {
keywords: $('#keywords').val(),
area1: '6aba668e-8ab3-4fbb-8886-b2d468ccf00e',
// 6aba668e-8ab3-4fbb-8886-b2d468ccf00e
area1: $('#area1').val(),
area2: $('#area2').val(),
area3: $('#area3').val(),
area4: $('#area4').val(),
@ -483,6 +487,19 @@
}
}
});
table.on('tool(dataTable)', function(obj) {
var data = obj.data;
var event = obj.event;
if(event === 'pollutionEvent') {
top.dialog.open({
url: top.restAjax.path('route/enterprise/update-enterprise-pollution.html?enterpriseId={enterpriseId}', [data.enterpriseId]),
title: '污染情况',
width: '600px',
height: '80%',
onClose: function() {}
});
}
});
// 联动事件
// area1 选择事件
// form.on('select(area1)', function(data) {

44
src/main/resources/static/route/enterprise/save-enterprise.html
View File

@ -288,10 +288,30 @@
</div>
</div>
<blockquote class="layui-elem-quote">组织机构信息</blockquote>
<div class="layui-form-item">
<label class="layui-form-label">组织机构码</label>
<div class="layui-input-block">
<input type="text" id="bussinessRegNum" name="bussinessRegNum" class="layui-input" value="" placeholder="请输入组织机构代码证">
<div class="layui-row">
<div class="layui-col-md4 layui-col-sm4 layui-col-xs12">
<div class="layui-form-item">
<label class="layui-form-label">组织机构码</label>
<div class="layui-input-block">
<input type="text" id="bussinessRegNum" name="bussinessRegNum" class="layui-input" value="" placeholder="请输入组织机构代码证">
</div>
</div>
</div>
<div class="layui-col-md4 layui-col-sm4 layui-col-xs12">
<div class="layui-form-item">
<label class="layui-form-label">开始日期</label>
<div class="layui-input-block">
<input type="text" id="bussinessLicenseStartDate" name="bussinessLicenseStartDate" class="layui-input" value="" placeholder="请输入营业开始日期">
</div>
</div>
</div>
<div class="layui-col-md4 layui-col-sm4 layui-col-xs12">
<div class="layui-form-item">
<label class="layui-form-label">结束日期</label>
<div class="layui-input-block">
<input type="text" id="bussinessLicenseEndDate" name="bussinessLicenseEndDate" class="layui-input" value="" placeholder="请输入营业结束日期">
</div>
</div>
</div>
</div>
<div class="layui-form-item layui-form-text">
@ -562,6 +582,22 @@
parent.layer.close(parent.layer.getFrameIndex(window.name));
}
// 初始化日期
function initDate() {
// 日期选择
laydate.render({
elem: '#bussinessLicenseStartDate',
format: 'yyyy-MM-dd',
trigger: 'click'
});
laydate.render({
elem: '#bussinessLicenseEndDate',
format: 'yyyy-MM-dd',
trigger: 'click'
});
}
initDate();
function refreshDownloadTemplet(fileName, file) {
var dataRander = {};
dataRander[fileName] = file;

536
src/main/resources/static/route/enterprise/update-enterprise-pollution.html Normal file
View File

@ -0,0 +1,536 @@
<!doctype html>
<html lang="en">
<head>
<base href="/inspection/">
<meta charset="utf-8">
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
<link rel="stylesheet" href="assets/fonts/font-awesome/css/font-awesome.css"/>
<link rel="stylesheet" href="assets/layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="assets/layuiadmin/style/admin.css" media="all">
<link rel="stylesheet" href="assets/js/vendor/viewer/viewer.min.css">
<style>
.update-image-text-box {}
.update-image-text-box .image-text-box {display: inline-block; padding: 5px; position: relative;}
.update-image-text-box .image-text-box .image-box {width: 120px; height: 90px;}
.update-image-text-box .image-text-box .image-box img{width: 100%; height: 100%}
.update-image-text-box .image-text-box .text-box {width: 120px;}
.update-image-text-box .image-text-box .text-box input {width: 100%; height: 30px; text-align: center; padding: 0;}
.update-image-text-box .image-text-box .remove-image {position: absolute; top: 5px; right: 5px;}
</style>
</head>
<body>
<div class="layui-anim layui-anim-fadein">
<div class="layui-card">
<div class="layui-card-body" style="padding: 15px;">
<form class="layui-form layui-form-pane" lay-filter="dataForm">
<div class="layui-form-item layui-form-text">
<label class="layui-form-label">主要污染因子</label>
<div class="layui-input-block">
<div id="pollutionFactorTemplateBox" style="border: 1px solid #e6e6e6;" lay-filter="pollutionFactorTemplateBox"></div>
<script id="pollutionFactorTemplate" type="text/html">
{{# for(var i = 0, item; item = d[i++];) { }}
<input type="checkbox" name="pollutionFactor[{{item.dictionaryId}}]" title="{{item.dictionaryName}}">
{{# } }}
</script>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">危险废物</label>
<div class="layui-input-block">
<input type="text" id="pollutionFactorDangerous" name="pollutionFactorDangerous" class="layui-input" value="" placeholder="请输入危险废物" >
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">其他废物</label>
<div class="layui-input-block">
<input type="text" id="pollutionFactorOther" name="pollutionFactorOther" class="layui-input" value="" placeholder="请输入其他废物" >
</div>
</div>
<div class="layui-form-item layui-form-text">
<label class="layui-form-label">产污设施情况</label>
<div class="layui-input-block">
<input type="hidden" id="pollutionFacilities" name="pollutionFacilities">
<input type="hidden" id="pollutionFacilitiesImage" name="pollutionFacilitiesImage">
<div class="update-image-text-box" id="pollutionFacilitiesImageFileBox" style="border: 1px solid #e6e6e6;" lay-filter="pollutionFacilitiesImageFileBox"></div>
<script id="pollutionFacilitiesImageFileDownload" type="text/html">
{{# var fileName = 'pollutionFacilitiesImage'; }}
{{# if(d[fileName].length > 0) { }}
{{# var files = d[fileName];}}
{{# for(var i = 0, item = files[i]; item = files[i++];) { }}
<div class="image-text-box">
<div class="image-box">
<img src="route/file/downloadfile/false/{{item.fileId}}" align="加载失败">
</div>
<div class="text-box">
<input type="text" class="layui-input pollutionFacilitiesImage" id="pollutionFacilitiesImage{{item.fileId}}" name="pollutionFacilitiesImage{{item.fileId}}" value="" placeholder="请输入名称" lay-verify="required">
</div>
<a class="layui-btn layui-btn-xs layui-btn-danger text-danger remove-image" href="javascript:void(0);" lay-form-button data-id="{{item.fileId}}" data-name="{{fileName}}" lay-filter="pollutionFacilitiesImageRemoveFile">
<i class="fa fa-trash-o"></i>
</a>
</div>
{{# } }}
{{# } }}
{{# if(d[fileName].length < 20) { }}
<div class="upload-image-box" style="width: auto; height: auto; padding: 5px;">
<a href="javascript:void(0);" lay-form-button data-explain="产污设施情况" data-name="pollutionFacilitiesImage" lay-filter="pollutionFacilitiesImageUploadFile">
<i class="fa fa-plus-square-o" style="font-size: 70px;"></i>
</a>
</div>
{{# } }}
</script>
</div>
</div>
<div class="layui-form-item layui-form-text">
<label class="layui-form-label">治污设施安装情况</label>
<div class="layui-input-block">
<input type="hidden" id="pollutionControlFacilities" name="pollutionControlFacilities">
<input type="hidden" id="pollutionControlFacilitiesImage" name="pollutionControlFacilitiesImage">
<div class="update-image-text-box" id="pollutionControlFacilitiesImageFileBox" style="border: 1px solid #e6e6e6;" lay-filter="pollutionControlFacilitiesImageFileBox"></div>
<script id="pollutionControlFacilitiesImageFileDownload" type="text/html">
{{# var fileName = 'pollutionControlFacilitiesImage'; }}
{{# if(d[fileName].length > 0) { }}
{{# var files = d[fileName];}}
{{# for(var i = 0, item = files[i]; item = files[i++];) { }}
<div class="image-text-box">
<div class="image-box">
<img src="route/file/downloadfile/false/{{item.fileId}}" align="加载失败">
</div>
<div class="text-box">
<input type="text" class="layui-input pollutionControlFacilitiesImage" id="pollutionControlFacilitiesImage{{item.fileId}}" name="pollutionControlFacilitiesImage{{item.fileId}}" value="" placeholder="请输入名称" lay-verify="required">
</div>
<a class="layui-btn layui-btn-xs layui-btn-danger text-danger remove-image" href="javascript:void(0);" lay-form-button data-id="{{item.fileId}}" data-name="{{fileName}}" lay-filter="pollutionControlFacilitiesImageRemoveFile">
<i class="fa fa-trash-o"></i>
</a>
</div>
{{# } }}
{{# } }}
{{# if(d[fileName].length < 20) { }}
<div class="upload-image-box" style="width: auto; height: auto; padding: 5px;">
<a href="javascript:void(0);" lay-form-button data-explain="治污设施安装情况" data-name="pollutionControlFacilitiesImage" lay-filter="pollutionControlFacilitiesImageUploadFile">
<i class="fa fa-plus-square-o" style="font-size: 70px;"></i>
</a>
</div>
{{# } }}
</script>
</div>
</div>
<div class="layui-form-item layui-form-text">
<label class="layui-form-label">环评及验收情况</label>
<div class="layui-input-block">
<div style="border: 1px solid #e6e6e6;">
<input type="radio" name="checkStatus" value="1" title="有环评" checked>
<input type="radio" name="checkStatus" value="2" title="无环评">
<input type="radio" name="checkStatus" value="3" title="已验收">
<input type="radio" name="checkStatus" value="4" title="未验收">
</div>
</div>
</div>
<div class="layui-form-item layui-form-text">
<label class="layui-form-label">相关文件</label>
<div class="layui-input-block">
<input type="hidden" id="relatedDocuments" name="relatedDocuments">
<div class="layui-btn-container" id="relatedDocumentsFileBox" style="border: 1px solid #e6e6e6;"></div>
<script id="relatedDocumentsFileDownload" type="text/html">
{{# var fileName = 'relatedDocuments'; }}
{{# if(d[fileName].length > 0) { }}
{{# var files = d[fileName];}}
{{# for(var i = 0, item = files[i]; item = files[i++];) { }}
<div class="upload-image-box">
<span class="upload-image-span">
<img src="route/file/downloadfile/false/{{item.fileId}}" align="加载失败">
</span>
<a class="layui-btn layui-btn-xs layui-btn-danger text-danger remove-image" href="javascript:void(0);" lay-form-button data-id="{{item.fileId}}" data-name="{{fileName}}" lay-filter="relatedDocumentsRemoveFile">
<i class="fa fa-trash-o"></i>
</a>
</div>
{{# } }}
{{# } }}
{{# if(d[fileName].length < 20) { }}
<div class="upload-image-box" style="width: auto; height: auto; padding: 5px;">
<a href="javascript:void(0);" lay-form-button data-explain="相关文件" data-name="relatedDocuments" lay-filter="relatedDocumentsUploadFile">
<i class="fa fa-plus-square-o" style="font-size: 70px;"></i>
</a>
</div>
{{# } }}
</script>
</div>
</div>
<div class="layui-form-item layui-layout-admin">
<div class="layui-input-block">
<div class="layui-footer" style="left: 0;">
<button type="button" class="layui-btn" lay-submit lay-filter="submitForm">提交编辑</button>
<button type="button" class="layui-btn layui-btn-primary close">返回上级</button>
</div>
</div>
</div>
</form>
</div>
</div>
</div>
<script src="assets/js/vendor/viewer/viewer.min.js"></script>
<script src="assets/layuiadmin/layui/layui.js"></script>
<script>
layui.config({
base: 'assets/layuiadmin/' //静态资源所在路径
}).extend({
index: 'lib/index' //主入口模块
}).use(['index', 'form', 'laydate', 'laytpl'], function(){
var $ = layui.$;
var form = layui.form;
var laytpl = layui.laytpl;
var laydate = layui.laydate;
var enterpriseId = top.restAjax.params(window.location.href).enterpriseId;
var viewerObj = {};
var imageTextArray = [{
fileId: '',
text: '',
}]
function closeBox() {
parent.layer.close(parent.layer.getFrameIndex(window.name));
}
function refreshDownloadTemplet(fileName, file) {
var dataRander = {};
dataRander[fileName] = file;
laytpl(document.getElementById(fileName +'FileDownload').innerHTML).render(dataRander, function(html) {
document.getElementById(fileName +'FileBox').innerHTML = html;
});
}
// 初始化文件列表
function initFileList(fileName, ids, callback) {
var dataForm = {};
dataForm[fileName] = ids;
form.val('dataForm', dataForm);
if(!ids) {
refreshDownloadTemplet(fileName, []);
if(callback) {
callback(fileName, []);
}
return;
}
top.restAjax.get(top.restAjax.path('api/file/listfilebyfileid', []), {
ids: ids
}, null, function(code, data) {
refreshDownloadTemplet(fileName, data);
if(callback) {
callback(fileName, data);
}
}, function(code, data) {
top.dialog.msg(data.msg);
});
}
// 初始化产污设施情况上传
function initPollutionFacilitiesImageTemplateUploadFile() {
var filesImage = $('#pollutionFacilities').val();
var filesArray = filesImage.split(',');
var fileIds = '';
for(var i = 0, item; item = filesArray[i++];) {
var fileId = item.split('|')[0];
if(fileIds.length > 0) {
fileIds += ',';
}
fileIds += fileId;
}
initFileList('pollutionFacilitiesImage', fileIds, function(fileName, data) {
var viewer = new Viewer(document.getElementById(fileName +'FileBox'), {navbar: false});
viewerObj[fileName] = viewer;
setImgText('pollutionFacilitiesImage');
});
form.on('button(pollutionFacilitiesImageUploadFile)', function(obj) {
var name = this.dataset.name;
var explain = this.dataset.explain;
top.dialog.file({
type: 'image',
title: '上传'+ explain,
width: '400px',
height: '420px',
maxFileCount: '1',
onClose: function() {
var uploadFileArray = top.dialog.dialogData.uploadFileArray;
if(typeof(uploadFileArray) != 'undefined' && uploadFileArray.length > 0) {
var files = $('#'+ name).val();
for(var j = 0, file = uploadFileArray[j]; file = uploadFileArray[j++];) {
if(files.length > 0) {
files += ',';
}
files += file.data;
}
initFileList(name, files, function(fileName, data) {
viewerObj[fileName].update();
setImgText(name);
});
}
}
});
});
form.on('button(pollutionFacilitiesImageRemoveFile)', function(obj) {
var name = this.dataset.name;
var id = this.dataset.id;
var files = $('#'+ name).val().replace(id, '');
files = files.replace(/\,+/g, ',');
if(files.charAt(0) == ',') {
files = files.substring(1);
}
if(files.charAt(files.length - 1) == ',') {
files = files.substring(0, files.length - 1);
}
initFileList(name, files, function(fileName) {
viewerObj[fileName].update();
setImgText(name);
});
});
}
// 初始化治污设施安装情况情况上传
function initPollutionControlFacilitiesImageTemplateUploadFile() {
var filesImage = $('#pollutionControlFacilities').val();
var filesArray = filesImage.split(',');
var fileIds = '';
for(var i = 0, item; item = filesArray[i++];) {
var fileId = item.split('|')[0];
if(fileIds.length > 0) {
fileIds += ',';
}
fileIds += fileId;
}
initFileList('pollutionControlFacilitiesImage', fileIds, function(fileName) {
var viewer = new Viewer(document.getElementById(fileName +'FileBox'), {navbar: false});
viewerObj[fileName] = viewer;
setImgText('pollutionControlFacilitiesImage');
});
form.on('button(pollutionControlFacilitiesImageUploadFile)', function(obj) {
var name = this.dataset.name;
var explain = this.dataset.explain;
top.dialog.file({
type: 'image',
title: '上传'+ explain,
width: '400px',
height: '420px',
maxFileCount: '1',
onClose: function() {
var uploadFileArray = top.dialog.dialogData.uploadFileArray;
if(typeof(uploadFileArray) != 'undefined' && uploadFileArray.length > 0) {
var files = $('#'+ name).val();
for(var j = 0, file = uploadFileArray[j]; file = uploadFileArray[j++];) {
if(files.length > 0) {
files += ',';
}
files += file.data;
}
initFileList(name, files, function(fileName) {
viewerObj[fileName].update();
setImgText(name);
});
}
}
});
});
form.on('button(pollutionControlFacilitiesImageRemoveFile)', function(obj) {
var name = this.dataset.name;
var id = this.dataset.id;
var files = $('#'+ name).val().replace(id, '');
files = files.replace(/\,+/g, ',');
if(files.charAt(0) == ',') {
files = files.substring(1);
}
if(files.charAt(files.length - 1) == ',') {
files = files.substring(0, files.length - 1);
}
initFileList(name, files, function(fileName) {
viewerObj[fileName].update();
setImgText(name);
});
});
}
// 初始化相关文件图片上传
function initRelatedDocumentsUploadFile() {
var files = $('#relatedDocuments').val();
initFileList('relatedDocuments', files, function(fileName) {
var viewer = new Viewer(document.getElementById(fileName +'FileBox'), {navbar: false});
viewerObj[fileName] = viewer;
});
form.on('button(relatedDocumentsUploadFile)', function(obj) {
var name = this.dataset.name;
var explain = this.dataset.explain;
top.dialog.file({
type: 'image',
title: '上传'+ explain,
width: '400px',
height: '420px',
maxFileCount: '1',
onClose: function() {
var uploadFileArray = top.dialog.dialogData.uploadFileArray;
if(typeof(uploadFileArray) != 'undefined' && uploadFileArray.length > 0) {
var files = $('#'+ name).val();
for(var j = 0, file = uploadFileArray[j]; file = uploadFileArray[j++];) {
if(files.length > 0) {
files += ',';
}
files += file.data;
}
initFileList(name, files, function(fileName) {
viewerObj[fileName].update();
});
}
}
});
});
form.on('button(relatedDocumentsRemoveFile)', function(obj) {
var name = this.dataset.name;
var id = this.dataset.id;
var files = $('#'+ name).val().replace(id, '');
files = files.replace(/\,+/g, ',');
if(files.charAt(0) == ',') {
files = files.substring(1);
}
if(files.charAt(files.length - 1) == ',') {
files = files.substring(0, files.length - 1);
}
initFileList(name, files, function(fileName) {
viewerObj[fileName].update();
});
});
}
// 更新图片文字
function refreshImgText(inputId) {
var fileIds = $('#'+ inputId).val();
var fileIdArray = fileIds.split(',');
var fileTextIds = '';
for(var i = 0, item; item = fileIdArray[i++];) {
if(fileTextIds.length != 0) {
fileTextIds += ','
}
fileTextIds += item +'|'+ $('#'+ inputId + item).val();
}
$('#'+ inputId.replace('Image', '')).val(fileTextIds);
}
// 设置图片文本
function setImgText(inputId) {
var fileIds = $('#'+ inputId).val();
if(!fileIds) {
return;
}
var fileIdArray = $('#'+ inputId.replace('Image', '')).val().split(',');
for(var i = 0, item; item = fileIdArray[i++];) {
var imageTextArray = item.split('|');
$('#'+ inputId + imageTextArray[0]).val(imageTextArray[1]);
}
}
$(document).on('keyup', '.pollutionFacilitiesImage', function() {
refreshImgText('pollutionFacilitiesImage');
});
$(document).on('keyup', '.pollutionControlFacilitiesImage', function() {
refreshImgText('pollutionControlFacilitiesImage');
});
// 初始化污染因子
function initPollutionFactorTemplate(callback) {
top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/48b6829b-24b8-4c42-a21d-fe98dbe23fd5', []), {}, null, function(code, data) {
laytpl(document.getElementById('pollutionFactorTemplate').innerHTML).render(data, function(html) {
document.getElementById('pollutionFactorTemplateBox').innerHTML = html;
});
form.render('checkbox');
if(callback) {
callback();
}
}, function(code, data) {
top.dialog.msg(data.msg);
})
}
// 初始化内容
function initData() {
var loadLayerIndex;
top.restAjax.get(top.restAjax.path('api/enterprise/getenterprisepollutionbyenterpriseid/{enterpriseId}', [enterpriseId]), {}, null, function(code, data) {
initPollutionFactorTemplate(function() {
var pollutionFactorArray = data.pollutionFactor.split(',');
var dataFormData = {};
for(var i in data) {
dataFormData[i] = data[i] +'';
}
for(var i = 0, item; item = pollutionFactorArray[i++];) {
dataFormData['pollutionFactor['+ item +']'] = true;
}
form.val('dataForm', dataFormData);
form.render(null, 'dataForm');
initPollutionFacilitiesImageTemplateUploadFile();
initPollutionControlFacilitiesImageTemplateUploadFile();
initRelatedDocumentsUploadFile();
});
}, function(code, data) {
top.dialog.msg(data.msg);
}, function() {
loadLayerIndex = top.dialog.msg(top.dataMessage.loading, {icon: 16, time: 0, shade: 0.3});
}, function() {
top.dialog.close(loadLayerIndex);
});
}
initData();
// 提交表单
form.on('submit(submitForm)', function(formData) {
// 处理图片文本
refreshImgText('pollutionFacilitiesImage');
refreshImgText('pollutionControlFacilitiesImage');
var pollutionFactor = top.restAjax.checkBoxToString(formData.field, 'pollutionFactor');
formData.field.pollutionFactor = pollutionFactor;
// 提交表单
top.dialog.confirm(top.dataMessage.commit, function(index) {
top.dialog.close(index);
var loadLayerIndex;
top.restAjax.put(top.restAjax.path('api/enterprise/updateenterprisepollution/{enterpriseId}', [enterpriseId]), formData.field, null, function(code, data) {
var layerIndex = top.dialog.msg(top.dataMessage.updateSuccess, {
time: 0,
btn: [top.dataMessage.button.yes, top.dataMessage.button.no],
shade: 0.3,
yes: function(index) {
top.dialog.close(index);
window.location.reload();
},
btn2: function() {
closeBox();
}
});
}, function(code, data) {
top.dialog.msg(data.msg);
}, function() {
loadLayerIndex = top.dialog.msg(top.dataMessage.committing, {icon: 16, time: 0, shade: 0.3});
}, function() {
top.dialog.close(loadLayerIndex);
});
});
return false;
});
$('.close').on('click', function() {
closeBox();
});
// 校验
form.verify({
});
});
</script>
</body>
</html>

56
src/main/resources/static/route/enterprise/update-enterprise.html
View File

@ -218,13 +218,11 @@
</div>
</div>
<div class="layui-col-md4 layui-col-sm4 layui-col-xs12">
<div class="layui-col-md4 layui-col-sm4 layui-col-xs12">
<div class="layui-form-item" pane>
<label class="layui-form-label">商住楼下</label>
<div class="layui-input-block">
<input type="radio" name="isCommercialDownstairs" value="0" title="否" checked>
<input type="radio" name="isCommercialDownstairs" value="1" title="是">
</div>
<div class="layui-form-item" pane>
<label class="layui-form-label">商住楼下</label>
<div class="layui-input-block">
<input type="radio" name="isCommercialDownstairs" value="0" title="否" checked>
<input type="radio" name="isCommercialDownstairs" value="1" title="是">
</div>
</div>
</div>
@ -290,10 +288,30 @@
</div>
</div>
<blockquote class="layui-elem-quote">组织机构信息</blockquote>
<div class="layui-form-item">
<label class="layui-form-label">组织机构码</label>
<div class="layui-input-block">
<input type="text" id="bussinessRegNum" name="bussinessRegNum" class="layui-input" value="" placeholder="请输入组织机构代码证">
<div class="layui-row">
<div class="layui-col-md4 layui-col-sm4 layui-col-xs12">
<div class="layui-form-item">
<label class="layui-form-label">组织机构码</label>
<div class="layui-input-block">
<input type="text" id="bussinessRegNum" name="bussinessRegNum" class="layui-input" value="" placeholder="请输入组织机构代码证">
</div>
</div>
</div>
<div class="layui-col-md4 layui-col-sm4 layui-col-xs12">
<div class="layui-form-item">
<label class="layui-form-label">开始日期</label>
<div class="layui-input-block">
<input type="text" id="bussinessLicenseStartDate" name="bussinessLicenseStartDate" class="layui-input" value="" placeholder="请输入营业开始日期">
</div>
</div>
</div>
<div class="layui-col-md4 layui-col-sm4 layui-col-xs12">
<div class="layui-form-item">
<label class="layui-form-label">结束日期</label>
<div class="layui-input-block">
<input type="text" id="bussinessLicenseEndDate" name="bussinessLicenseEndDate" class="layui-input" value="" placeholder="请输入营业结束日期">
</div>
</div>
</div>
</div>
<div class="layui-form-item layui-form-text">
@ -566,6 +584,22 @@
parent.layer.close(parent.layer.getFrameIndex(window.name));
}
// 初始化日期
function initDate() {
// 日期选择
laydate.render({
elem: '#bussinessLicenseStartDate',
format: 'yyyy-MM-dd',
trigger: 'click'
});
laydate.render({
elem: '#bussinessLicenseEndDate',
format: 'yyyy-MM-dd',
trigger: 'click'
});
}
initDate();
function refreshDownloadTemplet(fileName, file) {
var dataRander = {};
dataRander[fileName] = file;