fix: 点击提交时候插入结果

ruoyi-api/src/main/java/com/ruoyi/api/controller/ApiController.java

@@ -2,14 +2,22 @@ package com.ruoyi.api.controller;
 
 import com.ruoyi.api.service.impl.ApiService;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.pm.domain.PmBasePenaltyType;
 import com.ruoyi.pm.domain.PmBasePersonInfo;
+import com.ruoyi.pm.domain.PmRecordPenalty;
+import com.ruoyi.pm.domain.PmRecordSan;
+import com.ruoyi.pm.service.IPmBasePenaltyTypeService;
 import com.ruoyi.pm.service.IPmBasePersonInfoService;
+import com.ruoyi.pm.service.IPmRecordPenaltyService;
 import com.ruoyi.pm.service.IPmRecordSanService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 
 /**
  * @author wanghao
@@ -26,13 +34,44 @@ public class ApiController {
     private IPmRecordSanService pmRecordSanService;
     @Autowired
     private IPmBasePersonInfoService pmBasePersonInfoService;
+    @Autowired
+    private IPmBasePenaltyTypeService pmBasePenaltyTypeService;
+
+    @Autowired
+    private IPmRecordPenaltyService pmRecordPenaltyService;
+
 
     @PostMapping("/selectPersonInfo")
-    public AjaxResult selectPersonInfo(String epc) {
+    public AjaxResult selectPersonInfo(String epc, String user) {
         PmBasePersonInfo info = pmBasePersonInfoService.selectPersonInfoByEpc(epc);
         if (info != null) {
+
             return AjaxResult.success(info);
         }
         return AjaxResult.error("未查询到该人员信息");
     }
+
+    @PostMapping("/selectPenaltyTypeList")
+    public AjaxResult selectPenaltyTypeList() {
+        List<PmBasePenaltyType> pmBasePenaltyTypes = pmBasePenaltyTypeService.selectPmBasePenaltyTypeList(null);
+        return AjaxResult.success(pmBasePenaltyTypes);
+    }
+
+    @PostMapping("/insertRrecordPenalty")
+    public AjaxResult insertRrecordPenalty(@RequestBody PmRecordPenalty pmRecordPenalty) {
+
+
+        PmRecordSan recordSan = new PmRecordSan();
+        recordSan.setQueryUser(pmRecordPenalty.getCreateBy());
+        recordSan.setQueryRfid(pmRecordPenalty.getEpc());
+        recordSan.setBasePersonId(pmRecordPenalty.getBasePersonId());
+        String checkState = pmRecordPenalty.getCheckState();
+        recordSan.setCheckState(checkState);
+        if (checkState.equals("1")) {
+            pmRecordPenaltyService.insertPmRecordPenalty(pmRecordPenalty);
+        }
+
+        return pmRecordSanService.insertPmRecordSan(recordSan) > 0 ? AjaxResult.success() : AjaxResult.error("新增失败");
+    }
+
 }

ruoyi-pm/src/main/java/com/ruoyi/pm/controller/PmRecordPenaltyController.java

@@ -111,7 +111,7 @@ public class PmRecordPenaltyController extends BaseController {
     @Log(title = "处罚记录", businessType = BusinessType.DELETE)
     @PostMapping("/remove")
     @ResponseBody
-    public AjaxResult remove(String ids) {
-        return toAjax(pmRecordPenaltyService.deletePmRecordPenaltyByRecordPenaltyIds(ids));
+    public AjaxResult remove(Long ids) {
+        return toAjax(pmRecordPenaltyService.updatePmRecordPenaltyById(ids));
     }
 }

ruoyi-pm/src/main/java/com/ruoyi/pm/domain/PmBasePenaltyType.java

@@ -28,7 +28,7 @@ public class PmBasePenaltyType extends TreeEntity{
 
     /** 处罚金额 */
     @Excel(name = "处罚金额")
-    private BigDecimal penaltyAmount;
+    private Double penaltyAmount;
 
     /** 类型状态 */
     @Excel(name = "类型状态")
@@ -64,12 +64,12 @@ public class PmBasePenaltyType extends TreeEntity{
         return penaltyInfo;
     }
 
-    public void setPenaltyAmount(BigDecimal penaltyAmount)
+    public void setPenaltyAmount(Double penaltyAmount)
     {
         this.penaltyAmount = penaltyAmount;
     }
 
-    public BigDecimal getPenaltyAmount()
+    public Double getPenaltyAmount()
     {
         return penaltyAmount;
     }

ruoyi-pm/src/main/java/com/ruoyi/pm/domain/PmRecordPenalty.java

@@ -1,9 +1,9 @@
 package com.ruoyi.pm.domain;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
  * 处罚记录对象 pm_record_penalty
@@ -11,35 +11,60 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * @author ruoyi
  * @date 2025-11-27
  */
-public class PmRecordPenalty extends BaseEntity{
+public class PmRecordPenalty extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** 处罚记录主键 */
+    /**
+     * 处罚记录主键
+     */
     private Long recordPenaltyId;
 
-    /** 处罚类型 */
+    /**
+     * 处罚类型
+     */
     @Excel(name = "处罚类型")
     private String penaltyType;
 
-    /** 类型编码 */
+    /**
+     * 类型编码
+     */
     @Excel(name = "类型编码")
     private String penaltyTypeCode;
 
-    /** 处罚说明 */
+    /**
+     * 处罚说明
+     */
     @Excel(name = "处罚说明")
     private String penaltyInfo;
 
-    /** 处罚金额 */
+    /**
+     * 处罚金额
+     */
     @Excel(name = "处罚金额")
     private Double penaltyAmount;
 
-    /** 处罚人员 */
+    /**
+     * 处罚人员
+     */
     @Excel(name = "处罚人员")
     private Long basePersonId;
 
-    /** 处理状态 */
+    /**
+     * 处理状态
+     */
     @Excel(name = "处理状态")
     private String processState;
+    private String epc;
+    private String checkState;
+
+
+    public String getCheckState() {
+        return checkState;
+    }
+
+    public void setCheckState(String checkState) {
+        this.checkState = checkState;
+    }
 
     private PmBasePersonInfo basePersonInfo;
 
@@ -51,90 +76,84 @@ public class PmRecordPenalty extends BaseEntity{
         this.basePersonInfo = basePersonInfo;
     }
 
-    public void setRecordPenaltyId(Long recordPenaltyId)
-    {
-        this.recordPenaltyId = recordPenaltyId;
+    public String getEpc() {
+        return epc;
     }
 
-    public Long getRecordPenaltyId()
-    {
+    public void setEpc(String epc) {
+        this.epc = epc;
+    }
+
+    public Long getRecordPenaltyId() {
         return recordPenaltyId;
     }
 
-    public void setPenaltyType(String penaltyType)
-    {
-        this.penaltyType = penaltyType;
+    public void setRecordPenaltyId(Long recordPenaltyId) {
+        this.recordPenaltyId = recordPenaltyId;
     }
 
-    public String getPenaltyType()
-    {
+    public String getPenaltyType() {
         return penaltyType;
     }
 
-    public void setPenaltyTypeCode(String penaltyTypeCode)
-    {
-        this.penaltyTypeCode = penaltyTypeCode;
+    public void setPenaltyType(String penaltyType) {
+        this.penaltyType = penaltyType;
     }
 
-    public String getPenaltyTypeCode()
-    {
+    public String getPenaltyTypeCode() {
         return penaltyTypeCode;
     }
 
-    public void setPenaltyInfo(String penaltyInfo)
-    {
-        this.penaltyInfo = penaltyInfo;
+    public void setPenaltyTypeCode(String penaltyTypeCode) {
+        this.penaltyTypeCode = penaltyTypeCode;
     }
 
-    public String getPenaltyInfo()
-    {
+    public String getPenaltyInfo() {
         return penaltyInfo;
     }
 
-    public void setPenaltyAmount(Double penaltyAmount)
-    {
-        this.penaltyAmount = penaltyAmount;
+    public void setPenaltyInfo(String penaltyInfo) {
+        this.penaltyInfo = penaltyInfo;
     }
 
-    public Double getPenaltyAmount()
-    {
+    public Double getPenaltyAmount() {
         return penaltyAmount;
     }
 
-    public void setBasePersonId(Long basePersonId)
-    {
-        this.basePersonId = basePersonId;
+    public void setPenaltyAmount(Double penaltyAmount) {
+        this.penaltyAmount = penaltyAmount;
     }
 
-    public Long getBasePersonId()
-    {
+    public Long getBasePersonId() {
         return basePersonId;
     }
 
-    public void setProcessState(String processState)
-    {
-        this.processState = processState;
+    public void setBasePersonId(Long basePersonId) {
+        this.basePersonId = basePersonId;
     }
 
-    public String getProcessState()
-    {
+    public String getProcessState() {
         return processState;
     }
 
+    public void setProcessState(String processState) {
+        this.processState = processState;
+    }
+
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("recordPenaltyId", getRecordPenaltyId())
-            .append("penaltyType", getPenaltyType())
-            .append("penaltyTypeCode", getPenaltyTypeCode())
-            .append("penaltyInfo", getPenaltyInfo())
-            .append("penaltyAmount", getPenaltyAmount())
-            .append("basePersonId", getBasePersonId())
-            .append("processState", getProcessState())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .toString();
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("recordPenaltyId", getRecordPenaltyId())
+                .append("penaltyType", getPenaltyType())
+                .append("penaltyTypeCode", getPenaltyTypeCode())
+                .append("penaltyInfo", getPenaltyInfo())
+                .append("penaltyAmount", getPenaltyAmount())
+                .append("basePersonId", getBasePersonId())
+                .append("processState", getProcessState())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .toString();
     }
 }

ruoyi-pm/src/main/java/com/ruoyi/pm/domain/PmRecordSan.java

@@ -26,8 +26,10 @@ public class PmRecordSan extends BaseEntity{
     private String queryRfid;
 
     /** 人员表主键 */
-    @Excel(name = "人员表主键")
     private Long basePersonId;
+    /** 查询结果 */
+    @Excel(name = "查询结果")
+    private String checkState;
 
     private PmBasePersonInfo basePersonInfo;
 
@@ -79,6 +81,14 @@ public class PmRecordSan extends BaseEntity{
         return basePersonId;
     }
 
+    public String getCheckState() {
+        return checkState;
+    }
+
+    public void setCheckState(String checkState) {
+        this.checkState = checkState;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

ruoyi-pm/src/main/java/com/ruoyi/pm/service/IPmRecordPenaltyService.java

@@ -58,4 +58,6 @@ public interface IPmRecordPenaltyService {
      * @return 结果
      */
     public int deletePmRecordPenaltyByRecordPenaltyId(Long recordPenaltyId);
+
+    int updatePmRecordPenaltyById(Long ids);
 }

ruoyi-pm/src/main/java/com/ruoyi/pm/service/impl/PmRecordPenaltyServiceImpl.java

@@ -90,4 +90,16 @@ public class PmRecordPenaltyServiceImpl implements IPmRecordPenaltyService {
     public int deletePmRecordPenaltyByRecordPenaltyId(Long recordPenaltyId) {
         return pmRecordPenaltyMapper.deletePmRecordPenaltyByRecordPenaltyId(recordPenaltyId);
     }
+
+    @Override
+    public int updatePmRecordPenaltyById(Long ids) {
+
+        PmRecordPenalty pmRecordPenalty = new PmRecordPenalty();
+        pmRecordPenalty.setRecordPenaltyId(ids);
+        pmRecordPenalty.setUpdateTime(DateUtils.getNowDate());
+        pmRecordPenalty.setUpdateBy(ShiroUtils.getLoginName());
+        pmRecordPenalty.setProcessState("1");
+
+        return pmRecordPenaltyMapper.updatePmRecordPenalty(pmRecordPenalty);
+    }
 }

ruoyi-pm/src/main/resources/mapper/pm/PmRecordPenaltyMapper.xml

@@ -34,7 +34,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                rfid_id,
                employee_id,
                people_name,
-               driver_code
+               driver_code,
+               phone_number
         from pm_record_penalty rp
                  left join pm_base_person_info pbpi on rp.base_person_id = pbpi.base_person_id
     </sql>

ruoyi-pm/src/main/resources/mapper/pm/PmRecordSanMapper.xml

@@ -13,6 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
+        <result property="checkState"    column="check_state"    />
 
         <association property="basePersonInfo" javaType="PmBasePersonInfo" resultMap="com.ruoyi.pm.mapper.PmBasePersonInfoMapper.PmBasePersonInfoResult"/>
     </resultMap>
@@ -26,10 +27,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                rs.create_time,
                rs.update_by,
                rs.update_time,
+               check_state,
                rfid_id,
                employee_id,
                people_name,
-               driver_code
+               driver_code,
+               phone_number
         from pm_record_san rs
                  left join bgs_personnel_management.pm_base_person_info pbpi on rs.base_person_id = pbpi.base_person_id
     </sql>
@@ -57,6 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
+            <if test="checkState != null">check_state,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="queryUser != null">#{queryUser},</if>
@@ -66,6 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
+            <if test="checkState != null">#{checkState},</if>
          </trim>
     </insert>
 

ruoyi-pm/src/main/resources/templates/pm/record_penalty/record_penalty.html

@@ -28,7 +28,8 @@
                         </li>
                         <li class="select-time">
                             <label>记录时间：</label>
-                            <input class="time-input" id="startTime" name="params[beginCreateTime]" placeholder="开始时间"
+                            <input class="time-input" id="startTime" name="params[beginCreateTime]"
+                                   placeholder="开始时间"
                                    type="text"/>
                             <span>-</span>
                             <input class="time-input" id="endTime" name="params[endCreateTime]" placeholder="结束时间"
@@ -36,7 +37,8 @@
                         </li>
                         <li class="select-time">
                             <label>处理时间：</label>
-                            <input class="time-input" id="startTime" name="params[beginUpdateTime]" placeholder="开始时间"
+                            <input class="time-input" id="startTime" name="params[beginUpdateTime]"
+                                   placeholder="开始时间"
                                    type="text"/>
                             <span>-</span>
                             <input class="time-input" id="endTime" name="params[endUpdateTime]" placeholder="结束时间"
@@ -61,10 +63,10 @@
                shiro:hasPermission="pm:record_penalty:edit">
                 <i class="fa fa-edit"></i> 修改
             </a>
-            <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()"
-               shiro:hasPermission="pm:record_penalty:remove">
-                <i class="fa fa-remove"></i> 删除
-            </a>
+            <!-- <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" -->
+            <!--    shiro:hasPermission="pm:record_penalty:remove"> -->
+            <!--     <i class="fa fa-remove"></i> 删除 -->
+            <!-- </a> -->
             <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="pm:record_penalty:export">
                 <i class="fa fa-download"></i> 导出
             </a>
@@ -89,6 +91,8 @@
             removeUrl: prefix + "/remove",
             exportUrl: prefix + "/export",
             modalName: "处罚记录",
+            sortName: "createTime",
+            sortOrder: "desc",
             columns: [{
                 checkbox: true
             },
@@ -167,13 +171,32 @@
                     formatter: function (value, row, index) {
                         var actions = [];
                         actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.recordPenaltyId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.recordPenaltyId + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="updatePmRecordPenaltyById(\'' + row.recordPenaltyId + '\',\'' + row.processState + '\')"><i class="fa fa-remove"></i>处理罚款</a>');
                         return actions.join('');
                     }
                 }]
         };
         $.table.init(options);
     });
+
+    function updatePmRecordPenaltyById( recordPenaltyId, processState) {
+        if (processState === '1') {
+            $.modal.alertWarning('该记录已处理，不能重复处理！');
+            return
+        }
+        $.modal.confirm("确定处理该条" + table.options.modalName + "信息吗？", function () {
+            // var url =  : table.options.removeUrl.replace("{id}", id);
+
+            $.operate.submit(table.options.removeUrl, "post", "json", {ids:recordPenaltyId});
+
+        });
+
+        // $.operate.confirm('确认处理罚款吗？', function (result) {
+        //     if (result) {
+        //
+        //     }
+        // });
+    }
 </script>
 </body>
 </html>

ruoyi-pm/src/main/resources/templates/pm/record_san/record_san.html

@@ -54,6 +54,7 @@
 <script th:inline="javascript">
     var editFlag = [[${@permission.hasPermi('pm:record_san:edit')}]];
     var removeFlag = [[${@permission.hasPermi('pm:record_san:remove')}]];
+    var processStateDatas = [[${@dict.getType('check_state')}]];
     var prefix = ctx + "pm/record_san";
 
     $(function () {
@@ -64,6 +65,8 @@
             removeUrl: prefix + "/remove",
             exportUrl: prefix + "/export",
             modalName: "扫描查询记录",
+            sortName: "createTime",
+            sortOrder: "desc",
             columns: [{
                 checkbox: true
             },
@@ -76,6 +79,14 @@
                     field: 'queryUser',
                     title: '查询人'
                 },
+               {
+                    field: 'checkState',
+                    title: '查询结果',
+                   formatter: function (value, row, index) {
+                       return $.table.selectDictLabel(processStateDatas, value);
+                   }
+                },
+
                 {
                     field: 'queryRfid',
                     title: '扫描RFID'
@@ -102,22 +113,22 @@
                     field: 'basePersonInfo.phoneNumber',
                     title: '联系电话'
                 },
-                {
-                    field: 'createBy',
-                    title: '创建人'
-                },
+                // {
+                //     field: 'createBy',
+                //     title: '创建人'
+                // },
                 {
                     field: 'createTime',
                     title: '创建时间'
                 },
-                {
-                    field: 'updateBy',
-                    title: '更新人'
-                },
-                {
-                    field: 'updateTime',
-                    title: '更新时间'
-                },
+                // {
+                //     field: 'updateBy',
+                //     title: '更新人'
+                // },
+                // {
+                //     field: 'updateTime',
+                //     title: '更新时间'
+                // },
                 {
                     title: '操作',
                     align: 'center',