徐明浩

危害工作许可证开票
票据列表页面

master/src/main/java/com/ruoyi/project/ticket/controller/THazardWorkPermitController.java

@@ -23,6 +23,7 @@ import java.util.List;
 @RestController
 @RequestMapping("/ticket/hazardworks")
 public class THazardWorkPermitController extends BaseController {
+
     @Autowired
     private ITHazardWorkPermitService tHazardWorkPermitService;
 
@@ -61,7 +62,8 @@ public class THazardWorkPermitController extends BaseController {
     @Log(title = "危害工作许可证", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody THazardWorkPermit tHazardWorkPermit) {
-        return toAjax(tHazardWorkPermitService.insertTHazardWorkPermit(tHazardWorkPermit));
+        tHazardWorkPermitService.insertTHazardWorkPermit(tHazardWorkPermit);
+        return AjaxResult.success(tHazardWorkPermit.getaId());
     }
 
     /**

master/src/main/java/com/ruoyi/project/ticket/mapper/THazardWorkPermitMapper.java

@@ -36,7 +36,7 @@ public interface THazardWorkPermitMapper
      * @param tHazardWorkPermit 【请填写功能名称】
      * @return 结果
      */
-    public int insertTHazardWorkPermit(THazardWorkPermit tHazardWorkPermit);
+    public Long insertTHazardWorkPermit(THazardWorkPermit tHazardWorkPermit);
 
     /**
      * 修改【请填写功能名称】

master/src/main/java/com/ruoyi/project/ticket/service/ITHazardWorkPermitService.java

@@ -33,7 +33,7 @@ public interface ITHazardWorkPermitService {
      * @param tHazardWorkPermit 【请填写功能名称】
      * @return 结果
      */
-    public int insertTHazardWorkPermit(THazardWorkPermit tHazardWorkPermit);
+    public Long insertTHazardWorkPermit(THazardWorkPermit tHazardWorkPermit);
 
     /**
      * 修改【请填写功能名称】

master/src/main/java/com/ruoyi/project/ticket/service/impl/THazardWorkPermitServiceImpl.java

@@ -3,9 +3,9 @@ package com.ruoyi.project.ticket.service.impl;
 import com.ruoyi.project.ticket.domain.THazardWorkPermit;
 import com.ruoyi.project.ticket.mapper.THazardWorkPermitMapper;
 import com.ruoyi.project.ticket.service.ITHazardWorkPermitService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -17,7 +17,7 @@ import java.util.List;
 @Service
 public class THazardWorkPermitServiceImpl implements ITHazardWorkPermitService {
 
-    @Autowired
+    @Resource
     private THazardWorkPermitMapper tHazardWorkPermitMapper;
 
     /**
@@ -49,7 +49,7 @@ public class THazardWorkPermitServiceImpl implements ITHazardWorkPermitService {
      * @return 结果
      */
     @Override
-    public int insertTHazardWorkPermit(THazardWorkPermit tHazardWorkPermit) {
+    public Long insertTHazardWorkPermit(THazardWorkPermit tHazardWorkPermit) {
         return tHazardWorkPermitMapper.insertTHazardWorkPermit(tHazardWorkPermit);
     }
 

master/src/main/resources/mybatis/ticket/THazardWorkPermitMapper.xml

@@ -245,7 +245,6 @@
         <result property="mOtherLicenceOne" column="m_other_licence_one"/>
         <result property="mOtherLicenceTwo" column="m_other_licence_two"/>
         <result property="mOtherLicenceThree" column="m_other_licence_three"/>
-        <result property="deptName" column="dept_name"/>
     </resultMap>
 
     <sql id="selectTHazardWorkPermitVo">
@@ -488,399 +487,12 @@
                d.m_assess_d_date,
                d.m_other_licence_one,
                d.m_other_licence_two,
-               d.m_other_licence_three,
-               s.dept_name
+               d.m_other_licence_three
         from t_hazard_work_permit d
-                 left join sys_dept s on s.dept_id = d.dept_id
     </sql>
 
     <select id="selectTHazardWorkPermitList" parameterType="THazardWorkPermit" resultMap="THazardWorkPermitResult">
         <include refid="selectTHazardWorkPermitVo"/>
-        <where>
-            <if test="aEquipmentName != null  and aEquipmentName != ''">and a_equipment_name like concat(concat('%',
-                #{aEquipmentName}), '%')
-            </if>
-            <if test="aEquipmentLeader != null  and aEquipmentLeader != ''">and a_equipment_leader =
-                #{aEquipmentLeader}
-            </if>
-            <if test="aEquipmentTel != null  and aEquipmentTel != ''">and a_equipment_tel = #{aEquipmentTel}</if>
-            <if test="aEquipmentOffice != null  and aEquipmentOffice != ''">and a_equipment_office =
-                #{aEquipmentOffice}
-            </if>
-            <if test="aConstructionName != null  and aConstructionName != ''">and a_construction_name like
-                concat(concat('%', #{aConstructionName}), '%')
-            </if>
-            <if test="aConstructionLeader != null  and aConstructionLeader != ''">and a_construction_leader =
-                #{aConstructionLeader}
-            </if>
-            <if test="aConstructionTel != null  and aConstructionTel != ''">and a_construction_tel =
-                #{aConstructionTel}
-            </if>
-            <if test="aConstructionOffice != null  and aConstructionOffice != ''">and a_construction_office =
-                #{aConstructionOffice}
-            </if>
-            <if test="aContractorName != null  and aContractorName != ''">and a_contractor_name like concat(concat('%',
-                #{aContractorName}), '%')
-            </if>
-            <if test="aContractorLeader != null  and aContractorLeader != ''">and a_contractor_leader =
-                #{aContractorLeader}
-            </if>
-            <if test="aContractorTel != null  and aContractorTel != ''">and a_contractor_tel = #{aContractorTel}</if>
-            <if test="aContractorOffice != null  and aContractorOffice != ''">and a_contractor_office =
-                #{aContractorOffice}
-            </if>
-            <if test="aIsNeedSafeLiaison != null ">and a_is_need_safe_liaison = #{aIsNeedSafeLiaison}</if>
-            <if test="aSafeLiaisonName != null  and aSafeLiaisonName != ''">and a_safe_liaison_name like
-                concat(concat('%', #{aSafeLiaisonName}), '%')
-            </if>
-            <if test="aSafeLiaisonSign != null  and aSafeLiaisonSign != ''">and a_safe_liaison_sign =
-                #{aSafeLiaisonSign}
-            </if>
-            <if test="aSafeLiaisonTel != null  and aSafeLiaisonTel != ''">and a_safe_liaison_tel = #{aSafeLiaisonTel}
-            </if>
-            <if test="aSafeLiaisonOffice != null  and aSafeLiaisonOffice != ''">and a_safe_liaison_office =
-                #{aSafeLiaisonOffice}
-            </if>
-            <if test="bDeviceName != null  and bDeviceName != ''">and b_device_name like concat(concat('%',
-                #{bDeviceName}), '%')
-            </if>
-            <if test="bWorkContent != null  and bWorkContent != ''">and b_work_content = #{bWorkContent}</if>
-            <if test="bValidityStartTime != null ">and b_validity_start_time = #{bValidityStartTime}</if>
-            <if test="bValidityEndTime != null ">and b_validity_end_time = #{bValidityEndTime}</if>
-            <if test="cHarmMatterName != null  and cHarmMatterName != ''">and c_harm_matter_name like concat(concat('%',
-                #{cHarmMatterName}), '%')
-            </if>
-            <if test="cIsDanger != null ">and c_is_danger = #{cIsDanger}</if>
-            <if test="cIsAttention != null ">and c_is_attention = #{cIsAttention}</if>
-            <if test="cIsToxic != null ">and c_is_toxic = #{cIsToxic}</if>
-            <if test="cIsFlammable != null ">and c_is_flammable = #{cIsFlammable}</if>
-            <if test="cIsOxidizing != null ">and c_is_oxidizing = #{cIsOxidizing}</if>
-            <if test="cIsExplosive != null ">and c_is_explosive = #{cIsExplosive}</if>
-            <if test="cIsCorrosive != null ">and c_is_corrosive = #{cIsCorrosive}</if>
-            <if test="cIsIrritantToxic != null ">and c_is_irritant_toxic = #{cIsIrritantToxic}</if>
-            <if test="cIsHealthHazard != null ">and c_is_health_hazard = #{cIsHealthHazard}</if>
-            <if test="cIsCompressedGas != null ">and c_is_compressed_gas = #{cIsCompressedGas}</if>
-            <if test="cIsEnvironmentalHazard != null ">and c_is_environmental_hazard = #{cIsEnvironmentalHazard}</if>
-            <if test="cIsHighTemp != null ">and c_is_high_temp = #{cIsHighTemp}</if>
-            <if test="cIsLowTemp != null ">and c_is_low_temp = #{cIsLowTemp}</if>
-            <if test="cIsPosPressure != null ">and c_is_pos_pressure = #{cIsPosPressure}</if>
-            <if test="cIsNegPressure != null ">and c_is_neg_pressure = #{cIsNegPressure}</if>
-            <if test="cIsMovingParts != null ">and c_is_moving_parts = #{cIsMovingParts}</if>
-            <if test="cIsHotSurfaces != null ">and c_is_hot_surfaces = #{cIsHotSurfaces}</if>
-            <if test="cIsColdSurfaces != null ">and c_is_cold_surfaces = #{cIsColdSurfaces}</if>
-            <if test="cIsVoltages != null ">and c_is_voltages = #{cIsVoltages}</if>
-            <if test="cIsWorkProtective != null ">and c_is_work_protective = #{cIsWorkProtective}</if>
-            <if test="cIsOtherDanger != null ">and c_is_other_danger = #{cIsOtherDanger}</if>
-            <if test="cOtherDangerContent != null  and cOtherDangerContent != ''">and c_other_danger_content =
-                #{cOtherDangerContent}
-            </if>
-            <if test="cIsHazardsProd != null ">and c_is_hazards_prod = #{cIsHazardsProd}</if>
-            <if test="cIsHazardsProdContent != null  and cIsHazardsProdContent != ''">and c_is_hazards_prod_content =
-                #{cIsHazardsProdContent}
-            </if>
-            <if test="cIsFire != null ">and c_is_fire = #{cIsFire}</if>
-            <if test="cHId != null ">and c_h_id = #{cHId}</if>
-            <if test="bAreaNo != null  and bAreaNo != ''">and b_area_no = #{bAreaNo}</if>
-            <if test="dIsOpenSafe != null ">and d_is_open_safe = #{dIsOpenSafe}</if>
-            <if test="dIsDisFeeder != null ">and d_is_dis_feeder = #{dIsDisFeeder}</if>
-            <if test="dIsBreakIncl != null ">and d_is_break_incl = #{dIsBreakIncl}</if>
-            <if test="dBreakInclContent != null ">and d_break_incl_content = #{dBreakInclContent}</if>
-            <if test="dEleCircuitNo != null  and dEleCircuitNo != ''">and d_ele_circuit_no = #{dEleCircuitNo}</if>
-            <if test="dInsTagNo != null  and dInsTagNo != ''">and d_ins_tag_no = #{dInsTagNo}</if>
-            <if test="dIsRadioactiveSources != null ">and d_is_radioactive_sources = #{dIsRadioactiveSources}</if>
-            <if test="dIsOtherEquSafe != null ">and d_is_other_equ_safe = #{dIsOtherEquSafe}</if>
-            <if test="dIsOtherEquSafeContent != null  and dIsOtherEquSafeContent != ''">and d_is_other_equ_safe_content
-                = #{dIsOtherEquSafeContent}
-            </if>
-            <if test="dIsDepress != null ">and d_is_depress = #{dIsDepress}</if>
-            <if test="dIsSingleBlocking != null ">and d_is_single_blocking = #{dIsSingleBlocking}</if>
-            <if test="dIsDoubleBlock != null ">and d_is_double_block = #{dIsDoubleBlock}</if>
-            <if test="dIsLockoutUsing != null ">and d_is_lockout_using = #{dIsLockoutUsing}</if>
-            <if test="dLockoutUsingContent != null  and dLockoutUsingContent != ''">and d_lockout_using_content =
-                #{dLockoutUsingContent}
-            </if>
-            <if test="dIsRemovePipe != null ">and d_is_remove_pipe = #{dIsRemovePipe}</if>
-            <if test="dIsDisPipes != null ">and d_is_dis_pipes = #{dIsDisPipes}</if>
-            <if test="dIsInsertBlindPlage != null ">and d_is_insert_blind_plage = #{dIsInsertBlindPlage}</if>
-            <if test="dIsMecSecure != null ">and d_is_mec_secure = #{dIsMecSecure}</if>
-            <if test="dMecSecureContent != null  and dMecSecureContent != ''">and d_mec_secure_content =
-                #{dMecSecureContent}
-            </if>
-            <if test="dIsIsolationDiagram != null ">and d_is_isolation_diagram = #{dIsIsolationDiagram}</if>
-            <if test="dIsOtherSafePlant != null ">and d_is_other_safe_plant = #{dIsOtherSafePlant}</if>
-            <if test="dOtherSafePlantContent != null  and dOtherSafePlantContent != ''">and d_other_safe_plant_content =
-                #{dOtherSafePlantContent}
-            </if>
-            <if test="dIsDrain != null ">and d_is_drain = #{dIsDrain}</if>
-            <if test="dIsClean != null ">and d_is_clean = #{dIsClean}</if>
-            <if test="dCleanContent != null  and dCleanContent != ''">and d_clean_content = #{dCleanContent}</if>
-            <if test="dIsFlush != null ">and d_is_flush = #{dIsFlush}</if>
-            <if test="dFlushContent != null  and dFlushContent != ''">and d_flush_content = #{dFlushContent}</if>
-            <if test="dIsOhterClean != null ">and d_is_ohter_clean = #{dIsOhterClean}</if>
-            <if test="dOtherCleanContent != null  and dOtherCleanContent != ''">and d_other_clean_content =
-                #{dOtherCleanContent}
-            </if>
-            <if test="dIsSiteDemarcation != null ">and d_is_site_demarcation = #{dIsSiteDemarcation}</if>
-            <if test="dSiteDemarcationContent != null  and dSiteDemarcationContent != ''">and d_site_demarcation_content
-                = #{dSiteDemarcationContent}
-            </if>
-            <if test="dIsAreaCover != null ">and d_is_area_cover = #{dIsAreaCover}</if>
-            <if test="dAreaCoverContent != null  and dAreaCoverContent != ''">and d_area_cover_content =
-                #{dAreaCoverContent}
-            </if>
-            <if test="dIsCloseTrucks != null ">and d_is_close_trucks = #{dIsCloseTrucks}</if>
-            <if test="dIsLeakFlanges != null ">and d_is_leak_flanges = #{dIsLeakFlanges}</if>
-            <if test="dIsOtherWorkSafe != null ">and d_is_other_work_safe = #{dIsOtherWorkSafe}</if>
-            <if test="dOtherWorkSafeContent != null  and dOtherWorkSafeContent != ''">and d_other_work_safe_content =
-                #{dOtherWorkSafeContent}
-            </if>
-            <if test="dIsOtherMeasure != null ">and d_is_other_measure = #{dIsOtherMeasure}</if>
-            <if test="dOtherMeasureContent != null  and dOtherMeasureContent != ''">and d_other_measure_content =
-                #{dOtherMeasureContent}
-            </if>
-            <if test="dIsSafeBriefing != null ">and d_is_safe_briefing = #{dIsSafeBriefing}</if>
-            <if test="dPartakeBriefingSign != null  and dPartakeBriefingSign != ''">and d_partake_briefing_sign =
-                #{dPartakeBriefingSign}
-            </if>
-            <if test="dPartakeBriefingDate != null ">and d_partake_briefing_date = #{dPartakeBriefingDate}</if>
-            <if test="dNoReasonContent != null  and dNoReasonContent != ''">and d_no_reason_content =
-                #{dNoReasonContent}
-            </if>
-            <if test="dSafeImplSign11 != null  and dSafeImplSign11 != ''">and d_safe_impl_sign11 = #{dSafeImplSign11}
-            </if>
-            <if test="dSafeImplDate11 != null ">and d_safe_impl_date11 = #{dSafeImplDate11}</if>
-            <if test="dSafeLiftedSign11 != null  and dSafeLiftedSign11 != ''">and d_safe_lifted_sign11 =
-                #{dSafeLiftedSign11}
-            </if>
-            <if test="dSafeLiftedDate11 != null ">and d_safe_lifted_date11 = #{dSafeLiftedDate11}</if>
-            <if test="dSafeImplSign12 != null  and dSafeImplSign12 != ''">and d_safe_impl_sign12 = #{dSafeImplSign12}
-            </if>
-            <if test="dSafeImplDate12 != null ">and d_safe_impl_date12 = #{dSafeImplDate12}</if>
-            <if test="dSafeLiftedSign12 != null  and dSafeLiftedSign12 != ''">and d_safe_lifted_sign12 =
-                #{dSafeLiftedSign12}
-            </if>
-            <if test="dSafeLiftedDate12 != null ">and d_safe_lifted_date12 = #{dSafeLiftedDate12}</if>
-            <if test="dSafeImplSign13 != null  and dSafeImplSign13 != ''">and d_safe_impl_sign13 = #{dSafeImplSign13}
-            </if>
-            <if test="dSafeImplDate13 != null ">and d_safe_impl_date13 = #{dSafeImplDate13}</if>
-            <if test="dSafeLiftedSign13 != null  and dSafeLiftedSign13 != ''">and d_safe_lifted_sign13 =
-                #{dSafeLiftedSign13}
-            </if>
-            <if test="dSafeLiftedDate13 != null ">and d_safe_lifted_date13 = #{dSafeLiftedDate13}</if>
-            <if test="dSafeImplSign14 != null  and dSafeImplSign14 != ''">and d_safe_impl_sign14 = #{dSafeImplSign14}
-            </if>
-            <if test="dSafeImplDate14 != null ">and d_safe_impl_date14 = #{dSafeImplDate14}</if>
-            <if test="dSafeLiftedSign14 != null  and dSafeLiftedSign14 != ''">and d_safe_lifted_sign14 =
-                #{dSafeLiftedSign14}
-            </if>
-            <if test="dSafeLiftedDate14 != null ">and d_safe_lifted_date14 = #{dSafeLiftedDate14}</if>
-            <if test="dSafeImplSign21 != null  and dSafeImplSign21 != ''">and d_safe_impl_sign21 = #{dSafeImplSign21}
-            </if>
-            <if test="dSafeImplDate21 != null ">and d_safe_impl_date21 = #{dSafeImplDate21}</if>
-            <if test="dSafeImplSign22 != null  and dSafeImplSign22 != ''">and d_safe_impl_sign22 = #{dSafeImplSign22}
-            </if>
-            <if test="dSafeImplDate22 != null ">and d_safe_impl_date22 = #{dSafeImplDate22}</if>
-            <if test="dSafeLiftedSign22 != null  and dSafeLiftedSign22 != ''">and d_safe_lifted_sign22 =
-                #{dSafeLiftedSign22}
-            </if>
-            <if test="dSafeLiftedDate22 != null ">and d_safe_lifted_date22 = #{dSafeLiftedDate22}</if>
-            <if test="dSafeImplSign23 != null  and dSafeImplSign23 != ''">and d_safe_impl_sign23 = #{dSafeImplSign23}
-            </if>
-            <if test="dSafeImplDate23 != null ">and d_safe_impl_date23 = #{dSafeImplDate23}</if>
-            <if test="dSafeLiftedSign23 != null  and dSafeLiftedSign23 != ''">and d_safe_lifted_sign23 =
-                #{dSafeLiftedSign23}
-            </if>
-            <if test="dSafeLiftedDate23 != null ">and d_safe_lifted_date23 = #{dSafeLiftedDate23}</if>
-            <if test="dSafeImplSign24 != null  and dSafeImplSign24 != ''">and d_safe_impl_sign24 = #{dSafeImplSign24}
-            </if>
-            <if test="dSafeImplDate24 != null ">and d_safe_impl_date24 = #{dSafeImplDate24}</if>
-            <if test="dSafeLiftedSign24 != null  and dSafeLiftedSign24 != ''">and d_safe_lifted_sign24 =
-                #{dSafeLiftedSign24}
-            </if>
-            <if test="dSafeLiftedDate24 != null ">and d_safe_lifted_date24 = #{dSafeLiftedDate24}</if>
-            <if test="dSafeImplSign25 != null  and dSafeImplSign25 != ''">and d_safe_impl_sign25 = #{dSafeImplSign25}
-            </if>
-            <if test="dSafeImplDate25 != null ">and d_safe_impl_date25 = #{dSafeImplDate25}</if>
-            <if test="dSafeLiftedSign25 != null  and dSafeLiftedSign25 != ''">and d_safe_lifted_sign25 =
-                #{dSafeLiftedSign25}
-            </if>
-            <if test="dSafeLiftedDate25 != null ">and d_safe_lifted_date25 = #{dSafeLiftedDate25}</if>
-            <if test="dSafeImplSign26 != null  and dSafeImplSign26 != ''">and d_safe_impl_sign26 = #{dSafeImplSign26}
-            </if>
-            <if test="dSafeImplDate26 != null ">and d_safe_impl_date26 = #{dSafeImplDate26}</if>
-            <if test="dSafeLiftedSign26 != null  and dSafeLiftedSign26 != ''">and d_safe_lifted_sign26 =
-                #{dSafeLiftedSign26}
-            </if>
-            <if test="dSafeLiftedDate26 != null ">and d_safe_lifted_date26 = #{dSafeLiftedDate26}</if>
-            <if test="dSafeImplSign27 != null  and dSafeImplSign27 != ''">and d_safe_impl_sign27 = #{dSafeImplSign27}
-            </if>
-            <if test="dSafeImplDate27 != null ">and d_safe_impl_date27 = #{dSafeImplDate27}</if>
-            <if test="dSafeLiftedSign27 != null  and dSafeLiftedSign27 != ''">and d_safe_lifted_sign27 =
-                #{dSafeLiftedSign27}
-            </if>
-            <if test="dSafeLiftedDate27 != null ">and d_safe_lifted_date27 = #{dSafeLiftedDate27}</if>
-            <if test="dSafeImplSign28 != null  and dSafeImplSign28 != ''">and d_safe_impl_sign28 = #{dSafeImplSign28}
-            </if>
-            <if test="dSafeImplDate28 != null ">and d_safe_impl_date28 = #{dSafeImplDate28}</if>
-            <if test="dSafeLiftedSign28 != null  and dSafeLiftedSign28 != ''">and d_safe_lifted_sign28 =
-                #{dSafeLiftedSign28}
-            </if>
-            <if test="dSafeLiftedDate28 != null ">and d_safe_lifted_date28 = #{dSafeLiftedDate28}</if>
-            <if test="dSafeImplSign29 != null  and dSafeImplSign29 != ''">and d_safe_impl_sign29 = #{dSafeImplSign29}
-            </if>
-            <if test="dSafeImplDate29 != null ">and d_safe_impl_date29 = #{dSafeImplDate29}</if>
-            <if test="dSafeImplSign210 != null  and dSafeImplSign210 != ''">and d_safe_impl_sign210 =
-                #{dSafeImplSign210}
-            </if>
-            <if test="dSafeImplDate210 != null ">and d_safe_impl_date210 = #{dSafeImplDate210}</if>
-            <if test="dSafeLiftedSign210 != null  and dSafeLiftedSign210 != ''">and d_safe_lifted_sign210 =
-                #{dSafeLiftedSign210}
-            </if>
-            <if test="dSafeLiftedDate210 != null ">and d_safe_lifted_date210 = #{dSafeLiftedDate210}</if>
-            <if test="dSafeImplSign31 != null  and dSafeImplSign31 != ''">and d_safe_impl_sign31 = #{dSafeImplSign31}
-            </if>
-            <if test="dSafeImplDate31 != null ">and d_safe_impl_date31 = #{dSafeImplDate31}</if>
-            <if test="dSafeImplSign32 != null  and dSafeImplSign32 != ''">and d_safe_impl_sign32 = #{dSafeImplSign32}
-            </if>
-            <if test="dSafeImplDate32 != null ">and d_safe_impl_date32 = #{dSafeImplDate32}</if>
-            <if test="dSafeImplSign33 != null  and dSafeImplSign33 != ''">and d_safe_impl_sign33 = #{dSafeImplSign33}
-            </if>
-            <if test="dSafeImplDate33 != null ">and d_safe_impl_date33 = #{dSafeImplDate33}</if>
-            <if test="dSafeImplSign34 != null  and dSafeImplSign34 != ''">and d_safe_impl_sign34 = #{dSafeImplSign34}
-            </if>
-            <if test="dSafeImplDate34 != null ">and d_safe_impl_date34 = #{dSafeImplDate34}</if>
-            <if test="dSafeImplSign41 != null  and dSafeImplSign41 != ''">and d_safe_impl_sign41 = #{dSafeImplSign41}
-            </if>
-            <if test="dSafeImplDate41 != null ">and d_safe_impl_date41 = #{dSafeImplDate41}</if>
-            <if test="dSafeLiftedSign41 != null  and dSafeLiftedSign41 != ''">and d_safe_lifted_sign41 =
-                #{dSafeLiftedSign41}
-            </if>
-            <if test="dSafeLiftedDate41 != null ">and d_safe_lifted_date41 = #{dSafeLiftedDate41}</if>
-            <if test="dSafeImplSign42 != null  and dSafeImplSign42 != ''">and d_safe_impl_sign42 = #{dSafeImplSign42}
-            </if>
-            <if test="dSafeImplDate42 != null ">and d_safe_impl_date42 = #{dSafeImplDate42}</if>
-            <if test="dSafeLiftedSign42 != null  and dSafeLiftedSign42 != ''">and d_safe_lifted_sign42 =
-                #{dSafeLiftedSign42}
-            </if>
-            <if test="dSafeLiftedDate42 != null ">and d_safe_lifted_date42 = #{dSafeLiftedDate42}</if>
-            <if test="dSafeImplSign43 != null  and dSafeImplSign43 != ''">and d_safe_impl_sign43 = #{dSafeImplSign43}
-            </if>
-            <if test="dSafeImplDate43 != null ">and d_safe_impl_date43 = #{dSafeImplDate43}</if>
-            <if test="dSafeLiftedSign43 != null  and dSafeLiftedSign43 != ''">and d_safe_lifted_sign43 =
-                #{dSafeLiftedSign43}
-            </if>
-            <if test="dSafeLiftedDate43 != null ">and d_safe_lifted_date43 = #{dSafeLiftedDate43}</if>
-            <if test="dSafeImplSign44 != null  and dSafeImplSign44 != ''">and d_safe_impl_sign44 = #{dSafeImplSign44}
-            </if>
-            <if test="dSafeImplDate44 != null ">and d_safe_impl_date44 = #{dSafeImplDate44}</if>
-            <if test="dSafeImplSign45 != null  and dSafeImplSign45 != ''">and d_safe_impl_sign45 = #{dSafeImplSign45}
-            </if>
-            <if test="dSafeImplDate45 != null ">and d_safe_impl_date45 = #{dSafeImplDate45}</if>
-            <if test="dSafeLiftedSign45 != null  and dSafeLiftedSign45 != ''">and d_safe_lifted_sign45 =
-                #{dSafeLiftedSign45}
-            </if>
-            <if test="dSafeLiftedDate45 != null ">and d_safe_lifted_date45 = #{dSafeLiftedDate45}</if>
-            <if test="dSafeImplSign51 != null  and dSafeImplSign51 != ''">and d_safe_impl_sign51 = #{dSafeImplSign51}
-            </if>
-            <if test="dSafeImplDate51 != null ">and d_safe_impl_date51 = #{dSafeImplDate51}</if>
-            <if test="dSafeLiftedSign51 != null  and dSafeLiftedSign51 != ''">and d_safe_lifted_sign51 =
-                #{dSafeLiftedSign51}
-            </if>
-            <if test="dSafeLiftedDate51 != null ">and d_safe_lifted_date51 = #{dSafeLiftedDate51}</if>
-            <if test="eIsPresent != null ">and e_is_present = #{eIsPresent}</if>
-            <if test="eIsRequiredPpe != null ">and e_is_required_ppe = #{eIsRequiredPpe}</if>
-            <if test="ePpeContent != null  and ePpeContent != ''">and e_ppe_content = #{ePpeContent}</if>
-            <if test="eIsSafeGoggles != null ">and e_is_safe_goggles = #{eIsSafeGoggles}</if>
-            <if test="eIsFaceShield != null ">and e_is_face_shield = #{eIsFaceShield}</if>
-            <if test="eIsProtectGloves != null ">and e_is_protect_gloves = #{eIsProtectGloves}</if>
-            <if test="eProtectGlovesContent != null  and eProtectGlovesContent != ''">and e_protect_gloves_content =
-                #{eProtectGlovesContent}
-            </if>
-            <if test="eIsRubberBoots != null ">and e_is_rubber_boots = #{eIsRubberBoots}</if>
-            <if test="eIsRubberApron != null ">and e_is_rubber_apron = #{eIsRubberApron}</if>
-            <if test="eIsProtectSuit != null ">and e_is_protect_suit = #{eIsProtectSuit}</if>
-            <if test="eProtectSuitContent != null  and eProtectSuitContent != ''">and e_protect_suit_content =
-                #{eProtectSuitContent}
-            </if>
-            <if test="eIsResProtect != null ">and e_is_res_protect = #{eIsResProtect}</if>
-            <if test="eResProtectContent != null  and eResProtectContent != ''">and e_res_protect_content =
-                #{eResProtectContent}
-            </if>
-            <if test="eIsFallArrest != null ">and e_is_fall_arrest = #{eIsFallArrest}</if>
-            <if test="eFallArrestContent != null  and eFallArrestContent != ''">and e_fall_arrest_content =
-                #{eFallArrestContent}
-            </if>
-            <if test="eIsOtherProtect != null ">and e_is_other_protect = #{eIsOtherProtect}</if>
-            <if test="eOtherProtectContent != null  and eOtherProtectContent != ''">and e_other_protect_content =
-                #{eOtherProtectContent}
-            </if>
-            <if test="eIsContinueMonitoring != null ">and e_is_continue_monitoring = #{eIsContinueMonitoring}</if>
-            <if test="eSafeAttendant != null  and eSafeAttendant != ''">and e_safe_attendant = #{eSafeAttendant}</if>
-            <if test="eSafeAttendantSign != null  and eSafeAttendantSign != ''">and e_safe_attendant_sign =
-                #{eSafeAttendantSign}
-            </if>
-            <if test="eIsNaturalVen != null ">and e_is_natural_ven = #{eIsNaturalVen}</if>
-            <if test="eNaturalVenContent != null  and eNaturalVenContent != ''">and e_natural_ven_content =
-                #{eNaturalVenContent}
-            </if>
-            <if test="eIsMecVen != null ">and e_is_mec_ven = #{eIsMecVen}</if>
-            <if test="eMecVenContent != null  and eMecVenContent != ''">and e_mec_ven_content = #{eMecVenContent}</if>
-            <if test="eIsExxtractDust != null ">and e_is_exxtract_dust = #{eIsExxtractDust}</if>
-            <if test="eIsAnalyzeAir != null ">and e_is_analyze_air = #{eIsAnalyzeAir}</if>
-            <if test="eAnalyzeAirContent != null  and eAnalyzeAirContent != ''">and e_analyze_air_content =
-                #{eAnalyzeAirContent}
-            </if>
-            <if test="eAnalyzeAirInterval != null  and eAnalyzeAirInterval != ''">and e_analyze_air_interval =
-                #{eAnalyzeAirInterval}
-            </if>
-            <if test="eIsOtherVen != null ">and e_is_other_ven = #{eIsOtherVen}</if>
-            <if test="eOtherVenContent != null  and eOtherVenContent != ''">and e_other_ven_content =
-                #{eOtherVenContent}
-            </if>
-            <if test="fIsAfterWorkSafe != null ">and f_is_after_work_safe = #{fIsAfterWorkSafe}</if>
-            <if test="fAfterWorkSafeContent != null  and fAfterWorkSafeContent != ''">and f_after_work_safe_content =
-                #{fAfterWorkSafeContent}
-            </if>
-            <if test="gFirstSign != null  and gFirstSign != ''">and g_first_sign = #{gFirstSign}</if>
-            <if test="gFirstDate != null ">and g_first_date = #{gFirstDate}</if>
-            <if test="gSecondSign != null  and gSecondSign != ''">and g_second_sign = #{gSecondSign}</if>
-            <if test="gSecondDate != null ">and g_second_date = #{gSecondDate}</if>
-            <if test="gThirdSign != null  and gThirdSign != ''">and g_third_sign = #{gThirdSign}</if>
-            <if test="gThirdDate != null ">and g_third_date = #{gThirdDate}</if>
-            <if test="gIsSpecialAssessment != null ">and g_is_special_assessment = #{gIsSpecialAssessment}</if>
-            <if test="gSpecialAssessment != null  and gSpecialAssessment != ''">and g_special_assessment =
-                #{gSpecialAssessment}
-            </if>
-            <if test="hSafeMesSign != null  and hSafeMesSign != ''">and h_safe_mes_sign = #{hSafeMesSign}</if>
-            <if test="hSafeMesDate != null ">and h_safe_mes_date = #{hSafeMesDate}</if>
-            <if test="hVNoOne != null ">and h_v_no_one = #{hVNoOne}</if>
-            <if test="hVNoTwo != null ">and h_v_no_two = #{hVNoTwo}</if>
-            <if test="hVNoThree != null ">and h_v_no_three = #{hVNoThree}</if>
-            <if test="iOneASign != null  and iOneASign != ''">and i_one_a_sign = #{iOneASign}</if>
-            <if test="iOneADate != null ">and i_one_a_date = #{iOneADate}</if>
-            <if test="iOneBSign != null  and iOneBSign != ''">and i_one_b_sign = #{iOneBSign}</if>
-            <if test="iOneBDate != null ">and i_one_b_date = #{iOneBDate}</if>
-            <if test="jOneBSign != null  and jOneBSign != ''">and j_one_b_sign = #{jOneBSign}</if>
-            <if test="jOneBDate != null ">and j_one_b_date = #{jOneBDate}</if>
-            <if test="jResMemberSign != null  and jResMemberSign != ''">and j_res_member_sign = #{jResMemberSign}</if>
-            <if test="jResMemberDate != null ">and j_res_member_date = #{jResMemberDate}</if>
-            <if test="jEISign != null  and jEISign != ''">and j_e_i_sign = #{jEISign}</if>
-            <if test="jEIDate != null ">and j_e_i_date = #{jEIDate}</if>
-            <if test="kConfirmSign != null  and kConfirmSign != ''">and k_confirm_sign = #{kConfirmSign}</if>
-            <if test="kConfirmDate != null ">and k_confirm_date = #{kConfirmDate}</if>
-            <if test="lNoticeSign != null  and lNoticeSign != ''">and l_notice_sign = #{lNoticeSign}</if>
-            <if test="lNoticeDate != null ">and l_notice_date = #{lNoticeDate}</if>
-            <if test="mAssessDContent != null  and mAssessDContent != ''">and m_assess_d_content = #{mAssessDContent}
-            </if>
-            <if test="mAssessDSign != null  and mAssessDSign != ''">and m_assess_d_sign = #{mAssessDSign}</if>
-            <if test="mAssessDDate != null ">and m_assess_d_date = #{mAssessDDate}</if>
-            <if test="mOtherLicenceOne != null ">and m_other_licence_one = #{mOtherLicenceOne}</if>
-            <if test="mOtherLicenceTwo != null ">and m_other_licence_two = #{mOtherLicenceTwo}</if>
-            <if test="mOtherLicenceThree != null ">and m_other_licence_three = #{mOtherLicenceThree}</if>
-            and d.del_flag = 0
-        </where>
-        <!-- 数据范围过滤 -->
-        ${params.dataScope}
     </select>
 
     <select id="selectTHazardWorkPermitById" parameterType="Long" resultMap="THazardWorkPermitResult">
@@ -888,7 +500,7 @@
         where a_id = #{aId}
     </select>
 
-    <insert id="insertTHazardWorkPermit" parameterType="THazardWorkPermit">
+    <insert id="insertTHazardWorkPermit" parameterType="THazardWorkPermit" useGeneratedKeys="true" keyColumn="aId">
         <selectKey keyProperty="aId" resultType="long" order="BEFORE">
             SELECT seq_t_hazard_work_permit.NEXTVAL as aId FROM DUAL
         </selectKey>

ui/src/api/invoicing/hazardwork.js

@@ -1,6 +1,7 @@
 import request from '@/utils/request'
+import {praseStrEmpty} from "@/utils/ruoyi";
 
-// 新增用户
+// 新增开票
 export function addTicket(data) {
   return request({
     url: '/ticket/hazardworks',
@@ -8,3 +9,29 @@ export function addTicket(data) {
     data: data
   })
 }
+
+// 修改票据
+export function updateTicket(data) {
+  return request({
+    url: '/ticket/hazardworks',
+    method: 'put',
+    data: data
+  })
+}
+
+// 查询票据列表
+export function listTicket(query) {
+  return request({
+    url: '/ticket/hazardworks/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询用户详细
+export function getInfo(aId) {
+  return request({
+    url: '/ticket/hazardworks/' + praseStrEmpty(aId),
+    method: 'get'
+  })
+}

ui/src/views/invoicing/ticketList/index.vue

@@ -1,24 +1,25 @@
 <template>
   <div class="app-container">
     <el-table v-loading="loading" :data="ticketList" :height="clientHeight" border>
-      <el-table-column label="编号" align="center" prop="id" :show-overflow-tooltip="true"/>
+      <el-table-column label="编号" align="center" prop="aId" :show-overflow-tooltip="true"/>
       <el-table-column label="日期" align="center" prop="plantCode" :show-overflow-tooltip="true"/>
       <el-table-column label="时间" align="center" prop="year" :show-overflow-tooltip="true"/>
       <el-table-column label="班组" align="center" prop="fileName" :show-overflow-tooltip="true"/>
       <el-table-column label="签发人" align="center" prop="filePath" :show-overflow-tooltip="true"/>
       <el-table-column label="续票状态" align="center" prop="filePath" :show-overflow-tooltip="true"/>
       <el-table-column label="延期票号" align="center" prop="filePath" :show-overflow-tooltip="true"/>
-      <el-table-column label="危害工作许可证票号" align="center" prop="filePath" :show-overflow-tooltip="true"/>
-      <el-table-column label="动火工作许可证票号" align="center" prop="filePath" :show-overflow-tooltip="true"/>
-      <el-table-column label="动火作业等级" align="center" prop="filePath" :show-overflow-tooltip="true"/>
-      <el-table-column label="限制性空间进入许可证票号" align="center" prop="filePath" :show-overflow-tooltip="true"/>
-      <el-table-column label="工作内容" align="center" prop="filePath" :show-overflow-tooltip="true"/>
+      <el-table-column label="危害工作许可证票号" align="center" prop="aId" :show-overflow-tooltip="true"/>
+      <el-table-column label="动火工作许可证票号" align="center" prop="aId" :show-overflow-tooltip="true"/>
+      <el-table-column label="动火作业等级" align="center" prop="aId" :show-overflow-tooltip="true"/>
+      <el-table-column label="限制性空间进入许可证票号" align="center" prop="aId" :show-overflow-tooltip="true"/>
+      <el-table-column label="工作内容" align="center" prop="bWorkContent" :show-overflow-tooltip="true"/>
       <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
           >修改
           </el-button>
           <el-button
@@ -34,6 +35,13 @@
 </template>
 
 <script>
+import {
+  addTicket,
+  listTicket
+} from "@/api/invoicing/hazardwork"
+import {listAlarmhistory} from "@/api/system/alarmhistory";
+import {getUser} from "@/api/system/user";
+
 export default {
   data() {
     return {
@@ -50,12 +58,27 @@ export default {
     };
   },
   created() {
+    this.getList();
   },
   methods: {
-    getList(){
-
-    }
-  }
+    getList() {
+      this.loading = true;
+      listTicket(this.queryParams).then(response => {
+        this.ticketList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.$router.push({
+        path: '/ticket/hazardwork',
+        query: {
+          aId: row.aId
+        }
+      });
+    },
+  },
 }
 </script>